Changeset 6085 in orxonox.OLD

Timestamp:

Dec 13, 2005, 11:52:02 AM (18 years ago)

Author:

patrick

Message:

network: worked on the network_world

Location:

branches/network/src

Files:

• Makefile.am (modified) (2 diffs)
• story_entities/network_world.cc (modified) (1 diff)
• world_entities/Makefile.am (modified) (4 diffs)

branches/network/src/Makefile.am

@@ -49 +49 @@
                   story_entities/campaign.cc \
                   story_entities/world.cc \
+                  story_entities/network_world.cc \
                   world_entities/world_entity.cc \
                   world_entities/camera.cc \
@@ -92 +93 @@
                  story_entities/campaign.h \
                  story_entities/world.h \
+                 story_entities/network_world.h \
                  world_entities/world_entity.h \
                  world_entities/camera.h \

branches/network/src/story_entities/network_world.cc

@@ -325 +325 @@
       if( created != NULL )
       {
-        if(created->isA(CL_WORLD_ENTITY))
+        if(created->isA(CL_SPAWNING_POINT))
           this->spawn(dynamic_cast<WorldEntity*>(created));
         printf("Created a Spawning Point %s: %s\n", created->getClassName(), created->getName());
       }
 
-          // 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();
       glmis->step(); //! @todo temporary

branches/network/src/world_entities/Makefile.am

@@ -8 +8 @@
                   camera.cc \
                   playable.cc \
-                  player.cc \
+                              player.cc \
                   npc.cc \
                   npc2.cc \
@@ -18 +18 @@
                   character_attributes.cc \
                   test_entity.cc \
-                  space_ships/space_ship.cc \
+                              space_ships/space_ship.cc \
                   weapons/weapon_manager.cc \
                   weapons/weapon.cc \
@@ -27 +27 @@
                   weapons/rocket.cc \
                   weapons/laser.cc \
-                  weapons/ground_turret.cc \
+                              weapons/ground_turret.cc \
                   weapons/crosshair.cc \
-                  weapons/ground_turret.cc \
+                              weapons/ground_turret.cc \
                   power_ups/power_up.cc \
                   power_ups/turret_power_up.cc \
@@ -38 +38 @@
                  camera.h \
                  playable.h \
-                 player.h \
+                             player.h \
                  npc.h \
                  npc2.h \