Changeset 6251 in orxonox.OLD for branches

Timestamp:

Dec 21, 2005, 4:40:13 PM (19 years ago)

Author:

patrick

Message:

network: debug less and client fix

Location:

branches/network/src

Files:

• lib/network/synchronizeable.cc (modified) (2 diffs)
• story_entities/network_world.cc (modified) (2 diffs)

branches/network/src/lib/network/synchronizeable.cc

@@ -55 +55 @@
 void Synchronizeable::writeBytes(const byte* data, int length, int sender)
 {
-  PRINTF(1)("Synchronizeable::writeBytes was called\n");
+  PRINTF(5)("Synchronizeable::writeBytes was called\n");
 }
 
@@ -63 +63 @@
 int Synchronizeable::readBytes(byte* data, int maxLength, int * reciever)
 {
-  PRINTF(1)("Synchronizeable::readBytes was called\n");
+  PRINTF(5)("Synchronizeable::readBytes was called\n");
 }
 

branches/network/src/story_entities/network_world.cc

@@ -352 +352 @@
     while( element != NULL)
     {
-      if( NetworkManager::getInstance()->isGameServer() || !strcmp( element->Value(), "SkyBox") || !strcmp( element->Value(), "Terrain")
-          || !strcmp( element->Value(), "SpaceShip"))
+      if( NetworkManager::getInstance()->isGameServer())
       {
 
@@ -378 +377 @@
         }
 
+      }
+      else if( !strcmp( element->Value(), "SkyBox") /*|| !strcmp( element->Value(), "Terrain")*/ || !strcmp( element->Value(), "SpaceShip"))
+      {
+        BaseObject* created = Factory::fabricate(element);
+        if( created != NULL )
+        {
+          if(created->isA(CL_WORLD_ENTITY))
+            this->spawn(dynamic_cast<WorldEntity*>(created));
+          printf("Created a %s: %s\n", created->getClassName(), created->getName());
+        }
+        else
+          PRINTF(1)("NetworkWorld: could not create this entity\n");
+
+          // if we load a 'Player' we use it as localPlayer
+
+
+          //todo do this more elegant
+        if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox"))
+          sky = dynamic_cast<SkyBox*>(created);
+        if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
+        {
+          terrain = dynamic_cast<Terrain*>(created);
+          CDEngine::getInstance()->setTerrain(terrain);
+        }
       }
       element = element->NextSiblingElement();