Changeset 6409 in orxonox.OLD

Timestamp:

Jan 4, 2006, 4:18:52 PM (18 years ago)

Author:

patrick

Message:

network: the network loading now works again, couldn't test it over the network, since my laptop realy is too slow (600MHz and no hw gl). now we can continue working on the network stuff

Location:

branches/network/src/story_entities

Files:

• game_world.cc (modified) (1 diff)
• multi_player_world.cc (modified) (3 diffs)
• multi_player_world.h (modified) (1 diff)
• multi_player_world_data.cc (modified) (1 diff)
• single_player_world.cc (modified) (2 diffs)
• story_entity.cc (modified) (1 diff)

branches/network/src/story_entities/game_world.cc

@@ -225 +225 @@
 /**
  *  ends the pause Phase
-*/
+ */
 bool GameWorld::resume()
 {

branches/network/src/story_entities/multi_player_world.cc

@@ -15 +15 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD
 
+
 #include "multi_player_world.h"
 #include "multi_player_world_data.h"
@@ -20 +21 @@
 #include "factory.h"
 #include "load_param.h"
+
+#include "network_manager.h"
 
 
@@ -66 +69 @@
 
 
+/**
+ *  synchronizes the network since this is a network world
+ *
+ * this function overrides the synchrinize from the GameWorld
+ */
+void MultiPlayerWorld::synchronize()
+{
+  NetworkManager::getInstance()->synchronize();
+}
 
-
-
-

branches/network/src/story_entities/multi_player_world.h

@@ -26 +26 @@
 
   void loadParams(const TiXmlElement* root);
+
+  protected:
+    virtual void synchronize();
 };
 

branches/network/src/story_entities/multi_player_world_data.cc

@@ -128 +128 @@
   }
 
-
   /* load the WorldEntities */
   element = root->FirstChildElement("WorldEntities");
   if( element == NULL)
+  {
     PRINTF(1)("NetworkWorld is missing 'WorldEntities'\n");
+  }
   else
   {
     element = element->FirstChildElement();
 
-    PRINTF(4)("Loading NetworkWorldEntities\n");
     while( element != NULL)
     {

branches/network/src/story_entities/single_player_world.cc

@@ -15 +15 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD
 
+
 #include "single_player_world.h"
 #include "single_player_world_data.h"
@@ -30 +31 @@
 
 using namespace std;
+
 
 //! This creates a Factory to fabricate a SinglePlayerWorld

branches/network/src/story_entities/story_entity.cc

@@ -17 +17 @@
 
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD
+
+
 #include "story_entity.h"
 
 #include "load_param.h"
+
 
 using namespace std;