Changeset 6097 in orxonox.OLD

Timestamp:

Dec 14, 2005, 2:29:44 AM (18 years ago)

Author:

patrick

Message:

network: the network core is almost finished

File:

• branches/network/src/story_entities/network_world.cc (modified) (2 diffs)

branches/network/src/story_entities/network_world.cc

@@ -341 +341 @@
   // find WorldEntities //
   ////////////////////////
-  if( /*NetworkManager::getInstance()->isGameServer()*/1)
-  {
-    element = root->FirstChildElement("WorldEntities");
-    if( element == NULL)
-    {
-      PRINTF(1)("NetworkWorld is missing 'WorldEntities'\n");
-    }
-    else
-    {
-      element = element->FirstChildElement();
+  if( NetworkManager::getInstance()->isGameServer())
+  {}
+
+  element = root->FirstChildElement("WorldEntities");
+  if( element == NULL)
+  {
+    PRINTF(1)("NetworkWorld is missing 'WorldEntities'\n");
+  }
+  else
+  {
+    element = element->FirstChildElement();
       // load Players/Objects/Whatever
-      PRINTF(4)("Loading NetworkWorldEntities\n");
-      while( element != NULL)
+    PRINTF(4)("Loading NetworkWorldEntities\n");
+    while( element != NULL)
+    {
+      if( NetworkManager::getInstance()->isGameServer() || !strcmp( element->Value(), "SkyBox") || !strcmp( element->Value(), "Terrain"))
       {
         BaseObject* created = Factory::fabricate(element);
@@ -374 +377 @@
           CDEngine::getInstance()->setTerrain(terrain);
         }
-        element = element->NextSiblingElement();
-        glmis->step(); //! @todo temporary
+
       }
+      element = element->NextSiblingElement();
+      glmis->step(); //! @todo temporary
       PRINTF(4)("Done loading NetworkWorldEntities\n");
     }
   }
+
 
     //////////////////////////////