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

Timestamp:

Jun 21, 2006, 11:45:20 PM (19 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.h (modified) (2 diffs)

branches/terrain/src/story_entities/game_world_data.h

@@ -14 +14 @@
 class Camera;
 class Player;
-class Terrain;
+class TerrainEntity;
 class WorldEntity;
 
@@ -57 +57 @@
     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)