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

Timestamp:

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

Author:

bensch

Message:

Cleanup after merge

Location:

branches/terrain/src/story_entities

Files:

• game_world.cc (modified) (1 diff)
• game_world_data.cc (modified) (2 diffs)
• game_world_data.h (modified) (2 diffs)
• multi_player_world_data.cc (modified) (3 diffs)

branches/terrain/src/story_entities/game_world.cc

@@ -30 +30 @@
 #include "camera.h"
 #include "environment.h"
-#include "terrain.h"
+#include "terrain_entity.h"
 #include "test_entity.h"
-#include "terrain.h"
+#include "terrain_entity.h"
 #include "playable.h"
 #include "environments/mapped_water.h"

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"
@@ -222 +222 @@
       if( element->Value() == "Terrain" && created->isA(CL_TERRAIN))
       {
-        this->terrain = dynamic_cast<Terrain*>(created);
+        this->terrain = dynamic_cast<TerrainEntity*>(created);
         CDEngine::getInstance()->setTerrain(terrain);
       }

branches/terrain/src/story_entities/game_world_data.h

@@ -14 +14 @@
 class Camera;
 class Player;
-class Terrain;
+class TerrainEntity;
 class WorldEntity;
 
@@ -58 +58 @@
     Player*                       localPlayer;    //!< The player, you fly through the level.
     WorldEntity*                  sky;            //!< The environmental sky of orxonox
-    Terrain*                      terrain;        //!< The terrain - ground
+    TerrainEntity*                terrain;        //!< The terrain - ground
 
     OrxSound::OggPlayer*          music;          //!< Reference to the SoundEngine's music player (OggPlayer)

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);
           }