Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
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:
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/terrain/src/story_entities/game_world.cc

    r8490 r8697  
    3030#include "camera.h"
    3131#include "environment.h"
    32 #include "terrain.h"
    3332#include "test_entity.h"
    34 #include "terrain.h"
     33#include "terrain_entity.h"
    3534#include "playable.h"
    3635#include "environments/mapped_water.h"

  • branches/terrain/src/story_entities/game_world_data.cc

    r8490 r8697  
    3131#include "player.h"
    3232#include "camera.h"
    33 #include "terrain.h"
     33#include "terrain_entity.h"
    3434#include "skybox.h"
    3535#include "md2/md2Model.h"
    … …  
    199199      BaseObject* created = Factory::fabricate(element);
    200200      if( created != NULL )
    201         PRINTF(4)("Created a %s: %s\n", created->getClassName(), created->getName());
     201        PRINTF(2)("Created a %s: %s\n", created->getClassName(), created->getName());
    202202
    203203      //todo do this more elegant
    … …  
    207207        State::setSkyBox(dynamic_cast<SkyBox*>(this->sky));
    208208      }
    209       if( element->Value() == "Terrain" && created->isA(CL_TERRAIN))
     209               
     210      if( element->Value() == "TerrainEntity" && created->isA(CL_TERRAIN))
    210211      {
    211         this->terrain = dynamic_cast<Terrain*>(created);
     212        this->terrain = dynamic_cast<TerrainEntity*>(created);
    212213        CDEngine::getInstance()->setTerrain(terrain);
    213214      }

  • branches/terrain/src/story_entities/game_world_data.h

    r7460 r8697  
    1414class Camera;
    1515class Player;
    16 class Terrain;
     16class TerrainEntity;
    1717class WorldEntity;
    1818
    … …  
    5757    Player*                       localPlayer;    //!< The player, you fly through the level.
    5858    WorldEntity*                  sky;            //!< The environmental sky of orxonox
    59     Terrain*                      terrain;        //!< The terrain - ground
     59    TerrainEntity*                terrain;        //!< The terrain - ground
    6060
    6161    OrxSound::OggPlayer*          music;          //!< Reference to the SoundEngine's music player (OggPlayer)

  • branches/terrain/src/story_entities/multi_player_world_data.cc

    r8490 r8697  
    3131#include "camera.h"
    3232#include "environment.h"
    33 #include "terrain.h"
     33#include "terrain_entity.h"
    3434#include "test_entity.h"
    35 #include "terrain.h"
    3635#include "md2/md2Model.h"
    3736#include "world_entities/projectiles/projectile.h"
    … …  
    157156        if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
    158157        {
    159           this->terrain = dynamic_cast<Terrain*>(created);
     158          this->terrain = dynamic_cast<TerrainEntity*>(created);
    160159          CDEngine::getInstance()->setTerrain(terrain);
    161160        }
    … …  
    188187          if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
    189188          {
    190             this->terrain = dynamic_cast<Terrain*>(created);
     189            this->terrain = dynamic_cast<TerrainEntity*>(created);
    191190            CDEngine::getInstance()->setTerrain(terrain);
    192191          }

  • branches/terrain/src/story_entities/simple_game_menu.cc

    r8619 r8697  
    3131#include "world_entity.h"
    3232#include "elements/image_entity.h"
    33 #include "terrain.h"
     33#include "terrain_entity.h"
    3434#include "camera.h"
    3535
Note: See TracChangeset for help on using the changeset viewer.