Changeset 6363 in orxonox.OLD

Timestamp:

Dec 30, 2005, 11:36:13 PM (18 years ago)

Author:

patrick

Message:

network: compiles and links again

Location:

branches/network/src

Files:

• Makefile.am (modified) (1 diff)
• story_entities/game_world.h (modified) (1 diff)
• story_entities/multi_player_world.cc (modified) (5 diffs)
• story_entities/single_player_world.cc (modified) (4 diffs)

branches/network/src/Makefile.am

@@ -100 +100 @@
                  story_entities/single_player_world.h \
                  story_entities/multi_player_world.h \
-                 story_entities/network_world.h \
                  world_entities/world_entity.h \
                  world_entities/camera.h \

branches/network/src/story_entities/game_world.h

@@ -79 +79 @@
     virtual void display ();
 
-    virtual void debug ();
-
 
   protected:

branches/network/src/story_entities/multi_player_world.cc

@@ -32 +32 @@
 
 MultiPlayerWorld::MultiPlayerWorld(const TiXmlElement* root)
+  : GameWorld(root)
 {
   this->constuctorInit("", -1);
@@ -86 +87 @@
 void MultiPlayerWorld::loadParams(const TiXmlElement* root)
 {
-  static_cast<GameWorld*>(this)->loadParams(root);
+  static_cast<MultiPlayerWorld*>(this)->loadParams(root);
 
   PRINTF(4)("Creating a MultiPlayerWorld\n");
@@ -99 +100 @@
  * before the load and after the proceeding storyentity has finished
  */
-ErrorMessage GameWorld::preLoad()
+ErrorMessage MultiPlayerWorld::preLoad()
 {
-  static_cast<GameWorld*>(this)->preLoad();
+  static_cast<MultiPlayerWorld*>(this)->preLoad();
 
   /* the the single player specific stuff */
@@ -108 +109 @@
 
 /**
- *  loads the GameWorld by initializing all resources, and set their default values.
+ *  loads the MultiPlayerWorld by initializing all resources, and set their default values.
  */
-ErrorMessage GameWorld::load()
+ErrorMessage MultiPlayerWorld::load()
 {
-  static_cast<GameWorld*>(this)->load();
+  static_cast<MultiPlayerWorld*>(this)->load();
 
   /* the the single player specific stuff here */
@@ -119 +120 @@
 
 /**
- *  post loads the GameWorld by initializing all resources, and set their default values.
+ *  post loads the MultiPlayerWorld by initializing all resources, and set their default values.
  */
-ErrorMessage GameWorld::postLoad()
+ErrorMessage MultiPlayerWorld::postLoad()
 {
-  static_cast<GameWorld*>(this)->postLoad();
+  static_cast<MultiPlayerWorld*>(this)->postLoad();
 
   /* the single player specific stuff here */

branches/network/src/story_entities/single_player_world.cc

@@ -88 +88 @@
 void SinglePlayerWorld::loadParams(const TiXmlElement* root)
 {
-  static_cast<GameWorld*>(this)->loadParams(root);
+  static_cast<SinglePlayerWorld*>(this)->loadParams(root);
 
   PRINTF(4)("Creating a SinglePlayerWorld\n");
@@ -101 +101 @@
  * before the load and after the proceeding storyentity has finished
  */
-ErrorMessage GameWorld::preLoad()
+ErrorMessage SinglePlayerWorld::preLoad()
 {
-  static_cast<GameWorld*>(this)->preLoad();
+  static_cast<SinglePlayerWorld*>(this)->preLoad();
 
   /* the the single player specific stuff */
@@ -110 +110 @@
 
 /**
- *  loads the GameWorld by initializing all resources, and set their default values.
+ *  loads the SinglePlayerWorld by initializing all resources, and set their default values.
  */
-ErrorMessage GameWorld::load()
+ErrorMessage SinglePlayerWorld::load()
 {
-  static_cast<GameWorld*>(this)->load();
+  static_cast<SinglePlayerWorld*>(this)->load();
 
   /* the the single player specific stuff here */
@@ -132 +132 @@
 
 /**
- *  post loads the GameWorld by initializing all resources, and set their default values.
+ *  post loads the SinglePlayerWorld by initializing all resources, and set their default values.
  */
-ErrorMessage GameWorld::postLoad()
+ErrorMessage SinglePlayerWorld::postLoad()
 {
-  static_cast<GameWorld*>(this)->postLoad();
+  static_cast<SinglePlayerWorld*>(this)->postLoad();
 
   /* the single player specific stuff here */