Changeset 8697 in orxonox.OLD for branches/terrain/src/story_entities/game_world_data.cc

Timestamp:

Jun 21, 2006, 11:45:20 PM (18 years ago)

Author:

patrick

Message:

merged the terrain with the new trunk (MARK TERRAIN)

Location:

branches/terrain

Files:

• . (copied) (copied from trunk)
• src/story_entities/game_world_data.cc (modified) (3 diffs)

branches/terrain/src/story_entities/game_world_data.cc

@@ -31 +31 @@
 #include "player.h"
 #include "camera.h"
-#include "terrain.h"
+#include "terrain_entity.h"
 #include "skybox.h"
 #include "md2/md2Model.h"
@@ -199 +199 @@
       BaseObject* created = Factory::fabricate(element);
       if( created != NULL )
-        PRINTF(4)("Created a %s: %s\n", created->getClassName(), created->getName());
+        PRINTF(2)("Created a %s: %s\n", created->getClassName(), created->getName());
 
       //todo do this more elegant
@@ -207 +207 @@
         State::setSkyBox(dynamic_cast<SkyBox*>(this->sky));
       }
-      if( element->Value() == "Terrain" && created->isA(CL_TERRAIN))
+                
+      if( element->Value() == "TerrainEntity" && created->isA(CL_TERRAIN))
       {
-        this->terrain = dynamic_cast<Terrain*>(created);
+        this->terrain = dynamic_cast<TerrainEntity*>(created);
         CDEngine::getInstance()->setTerrain(terrain);
       }