Changeset 9140 in orxonox.OLD for branches/terrain/src/story_entities
- Timestamp:
- Jul 4, 2006, 3:06:00 PM (18 years ago)
- Location:
- branches/terrain/src/story_entities
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/terrain/src/story_entities/game_world.cc
r9110 r9140 30 30 #include "camera.h" 31 31 #include "environment.h" 32 #include "terrain.h"33 32 #include "test_entity.h" 34 #include "terrain .h"33 #include "terrain_entity.h" 35 34 #include "playable.h" 36 35 #include "environments/mapped_water.h" -
branches/terrain/src/story_entities/game_world_data.cc
r9019 r9140 31 31 #include "player.h" 32 32 #include "camera.h" 33 #include "terrain .h"33 #include "terrain_entity.h" 34 34 #include "skybox.h" 35 35 #include "md2/md2Model.h" … … 209 209 BaseObject* created = Factory::fabricate(element); 210 210 if( created != NULL ) 211 PRINTF( 4)("Created a %s: %s\n", created->getClassName(), created->getName());211 PRINTF(2)("Created a %s: %s\n", created->getClassName(), created->getName()); 212 212 213 213 //todo do this more elegant … … 217 217 State::setSkyBox(dynamic_cast<SkyBox*>(this->sky)); 218 218 } 219 if( element->Value() == "Terrain" && created->isA(CL_TERRAIN)) 219 220 if( element->Value() == "TerrainEntity" && created->isA(CL_TERRAIN)) 220 221 { 221 this->terrain = dynamic_cast<Terrain *>(created);222 this->terrain = dynamic_cast<TerrainEntity*>(created); 222 223 CDEngine::getInstance()->setTerrain(terrain); 223 224 } -
branches/terrain/src/story_entities/game_world_data.h
r7460 r9140 14 14 class Camera; 15 15 class Player; 16 class Terrain ;16 class TerrainEntity; 17 17 class WorldEntity; 18 18 … … 57 57 Player* localPlayer; //!< The player, you fly through the level. 58 58 WorldEntity* sky; //!< The environmental sky of orxonox 59 Terrain *terrain; //!< The terrain - ground59 TerrainEntity* terrain; //!< The terrain - ground 60 60 61 61 OrxSound::OggPlayer* music; //!< Reference to the SoundEngine's music player (OggPlayer) -
branches/terrain/src/story_entities/multi_player_world_data.cc
r9008 r9140 31 31 #include "camera.h" 32 32 #include "environment.h" 33 #include "terrain .h"33 #include "terrain_entity.h" 34 34 #include "test_entity.h" 35 #include "terrain.h"36 35 #include "md2/md2Model.h" 37 36 #include "world_entities/projectiles/projectile.h" … … 157 156 if( element->Value() != NULL && !strcmp( element->Value(), "Terrain")) 158 157 { 159 this->terrain = dynamic_cast<Terrain *>(created);158 this->terrain = dynamic_cast<TerrainEntity*>(created); 160 159 CDEngine::getInstance()->setTerrain(terrain); 161 160 } … … 188 187 if( element->Value() != NULL && !strcmp( element->Value(), "Terrain")) 189 188 { 190 this->terrain = dynamic_cast<Terrain *>(created);189 this->terrain = dynamic_cast<TerrainEntity*>(created); 191 190 CDEngine::getInstance()->setTerrain(terrain); 192 191 } -
branches/terrain/src/story_entities/simple_game_menu.cc
r8717 r9140 31 31 #include "world_entity.h" 32 32 #include "elements/image_entity.h" 33 #include "terrain .h"33 #include "terrain_entity.h" 34 34 #include "camera.h" 35 35
Note: See TracChangeset
for help on using the changeset viewer.