compiling with gcc 4.2.3 verified

7 files changed, 33 insertions, 17 deletions

diff --git a/ROADMAP b/ROADMAP
index a3ca777..310a001 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -1,6 +1,6 @@
 ROADMAP
 
-* VERSION 0.1
+* MILESTONE 1
 
 Description:
 	The game takes place in a simple solar system with one star,
@@ -17,7 +17,7 @@ Requires:
 	Entities
 
 
-* VERSION 0.2
+* MILESTONE 2
 	Players can shoot at each other. They can crash into the star 
 	or the planet.
 
@@ -26,12 +26,16 @@ Requires:
 	collision detection
 
 
-* VERSION 0.3
-	Players can dock at the space station.
+* MILESTONE 3
+	Players can dock at the space station and buy a ship or purchase
+	weapons.
 
+Requires:
+	mechanisms for docking
+	gui
+
+* MILESTONE 4
 
-* VERSION 0.4
 
+* MILESTONE 5
 
-* VERSION 0.5
-	The game is ready to add data.
diff --git a/osirion.kdevelop b/osirion.kdevelop
index 58a8bfc..82878a1 100644
--- a/osirion.kdevelop
+++ b/osirion.kdevelop
@@ -21,7 +21,7 @@
   </general>
   <kdevautoproject>
     <general>
-      <activetarget>src/client/libclient.la</activetarget>
+      <activetarget>src/game/libgame.la</activetarget>
       <useconfiguration>debug</useconfiguration>
     </general>
     <run>
diff --git a/osirion.kdevelop.pcs b/osirion.kdevelop.pcs
index 49bad62..c5a092e 100644
--- a/osirion.kdevelop.pcs
+++ b/osirion.kdevelop.pcs
diff --git a/osirion.kdevses b/osirion.kdevses
index f0d27df..4bc0ebe 100644
--- a/osirion.kdevses
+++ b/osirion.kdevses
@@ -1,13 +1,25 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="2" >
-  <Doc0 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/client/draw.cc" >
-   <View0 Encoding="" line="152" Type="Source" />
+ <DocsAndViews NumberOfDocuments="6" >
+  <Doc0 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/game/shipmodel.cc" >
+   <View0 Encoding="" line="0" Type="Source" />
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/render/model.cc" >
-   <View0 Encoding="" line="415" Type="Source" />
+  <Doc1 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/game/ship.cc" >
+   <View0 Encoding="" line="0" Type="Source" />
   </Doc1>
+  <Doc2 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/game/game.cc" >
+   <View0 Encoding="" line="203" Type="Source" />
+  </Doc2>
+  <Doc3 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/filesystem/inifile.cc" >
+   <View0 Encoding="" line="104" Type="Source" />
+  </Doc3>
+  <Doc4 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/core/gameconnection.cc" >
+   <View0 Encoding="" line="84" Type="Source" />
+  </Doc4>
+  <Doc5 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/core/netconnection.cc" >
+   <View0 Encoding="" line="179" Type="Source" />
+  </Doc5>
  </DocsAndViews>
  <pluginList>
   <kdevdebugger>
diff --git a/src/core/netconnection.cc b/src/core/netconnection.cc
index 455c03d..b87477b 100644
--- a/src/core/netconnection.cc
+++ b/src/core/netconnection.cc
@@ -154,7 +154,7 @@ void NetConnection::parse_incoming_message(const std::string & message)
 		msgstream >> id;
 
 		Entity *e = Entity::find(id);
-		con_debug << "Received die entity id " << id << "\n";
+		//con_debug << "Received die entity id " << id << "\n";
 		
 		if (localcontrol() == e) 
 			localplayer()->player_control = 0;
@@ -165,7 +165,7 @@ void NetConnection::parse_incoming_message(const std::string & message)
 		unsigned int type;
 		msgstream >> type;
 
-		con_debug << "Received create entity type " << type << "\n";
+		//con_debug << "Received create entity type " << type << "\n";
 		switch (type) 
 		{
 		case Entity::Default:
diff --git a/src/filesystem/inifile.cc b/src/filesystem/inifile.cc
index 8b6e8ad..02dbcf8 100644
--- a/src/filesystem/inifile.cc
+++ b/src/filesystem/inifile.cc
@@ -100,7 +100,7 @@ bool IniFile::getline() {
 		return false;
 }
 
-bool IniFile::got_key_string(char * const keylabel, std::string & valuestring) {
+bool IniFile::got_key_string(const char * keylabel, std::string & valuestring) {
 	//condebug << "IniFile got_value_string " << keylabel << " " << last_read_was_key << std::endl;
 	if (last_read_was_key && (key_current.compare(keylabel) == 0 )) {
 		valuestring.assign(value_current);
diff --git a/src/filesystem/inifile.h b/src/filesystem/inifile.h
index ba7eb6a..632d432 100644
--- a/src/filesystem/inifile.h
+++ b/src/filesystem/inifile.h
@@ -58,7 +58,7 @@ public:
 	}
 
 	/// check if the last read key=value pair matches keylabel and store the value in valuestring
-	bool got_key_string(char * const keylabel, std::string & valuestring);
+	bool got_key_string(const char * keylabel, std::string & valuestring);
 
 	inline unsigned int line() const {
 		return line_number;