Changeset 6341 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Dec 30, 2005, 1:57:12 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back to the trunk, so we do not get away from each other to fast

File:

• trunk/src/story_entities/network_world.cc (modified) (8 diffs)

trunk/src/story_entities/network_world.cc

@@ -69 +69 @@
 #include "playable.h"
 #include "network_manager.h"
+#include "network_game_manager.h"
 #include "playable.h"
 
@@ -167 +168 @@
 {
   this->setClassID(CL_WORLD, "NetworkWorld");
+  PRINTF(0)("START\n");
 
   this->setName(name);
@@ -337 +339 @@
   // find WorldEntities //
   ////////////////////////
-  if( NetworkManager::getInstance()->isGameServer())
-  {}
-
   element = root->FirstChildElement("WorldEntities");
   if( element == NULL)
@@ -352 +351 @@
     while( element != NULL)
     {
-      if( NetworkManager::getInstance()->isGameServer() || !strcmp( element->Value(), "SkyBox") || !strcmp( element->Value(), "Terrain")
-          || !strcmp( element->Value(), "SpaceShip"))
+      if( NetworkManager::getInstance()->isGameServer())
+      {
+
+        BaseObject* created = NetworkGameManager::getInstance()->createEntity(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);
+        }
+
+      }
+      else if( /* !strcmp( element->Value(), "SkyBox") || */ /* !strcmp( element->Value(), "Terrain") || */ !strcmp( element->Value(), "SpaceShip"))
       {
         BaseObject* created = Factory::fabricate(element);
@@ -362 +386 @@
           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
@@ -374 +400 @@
           CDEngine::getInstance()->setTerrain(terrain);
         }
-
       }
       element = element->NextSiblingElement();
@@ -443 +468 @@
 //   this->spawn(testEntity);
 
-  for(int i = 0; i < 100; i++)
-  {
-    WorldEntity* tmp = new NPCTest1();
-    char npcChar[10];
-    sprintf (npcChar, "NPC_%d", i);
-        tmp->setName(npcChar);
-    tmp->setAbsCoor(((float)rand()/RAND_MAX) * 5000, 50/*+ (float)rand()/RAND_MAX*20*/, ((float)rand()/RAND_MAX -.5) *30);
-    this->spawn(tmp);
-  }
+//   for(int i = 0; i < 100; i++)
+//   {
+//     WorldEntity* tmp = NetworkGameManager::;
+//     char npcChar[10];
+//     sprintf (npcChar, "NPC_%d", i);
+//         tmp->setName(npcChar);
+//     tmp->setAbsCoor(((float)rand()/RAND_MAX) * 5000, 50/*+ (float)rand()/RAND_MAX*20*/, ((float)rand()/RAND_MAX -.5) *30);
+//     this->spawn(tmp);
+//   }
 
   this->music = NULL;
@@ -865 +890 @@
 //   this->entities->add (entity);
   entity->postSpawn ();
+
 }