Changeset 9417 in orxonox.OLD for branches/terrain/src/story_entities/multi_player_world_data.cc

Timestamp:

Jul 24, 2006, 1:23:47 PM (18 years ago)

Author:

bensch

Message:

Cleanup after merge

File:

• branches/terrain/src/story_entities/multi_player_world_data.cc (modified) (3 diffs)

branches/terrain/src/story_entities/multi_player_world_data.cc

@@ -31 +31 @@
 #include "camera.h"
 #include "environment.h"
-#include "terrain.h"
+#include "terrain_entity.h"
 #include "test_entity.h"
-#include "terrain.h"
 #include "md2/md2Model.h"
 #include "world_entities/projectiles/projectile.h"
@@ -161 +160 @@
         if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox"))
           this->sky = dynamic_cast<WorldEntity*>(created);
-        if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
+        if( element->Value() != NULL && !strcmp( element->Value(), "TerrainEntityF"))
         {
-          this->terrain = dynamic_cast<Terrain*>(created);
+          this->terrain = dynamic_cast<TerrainEntity*>(created);
           CDEngine::getInstance()->setTerrain(terrain);
         }
@@ -194 +193 @@
           if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
           {
-            this->terrain = dynamic_cast<Terrain*>(created);
+            this->terrain = dynamic_cast<TerrainEntity*>(created);
             CDEngine::getInstance()->setTerrain(terrain);
           }