Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9417 in orxonox.OLD for branches/terrain/src/lib/collision_detection


Ignore:
Timestamp:
Jul 24, 2006, 1:23:47 PM (18 years ago)
Author:
bensch
Message:

Cleanup after merge

Location:
branches/terrain/src/lib/collision_detection
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/terrain/src/lib/collision_detection/cd_engine.cc

    r9406 r9417  
    2424#include "model.h"
    2525#include "world_entity.h"
    26 #include "terrain.h"
     26#include "terrain_entity.h"
    2727// #include "player.h"
    2828
  • branches/terrain/src/lib/collision_detection/cd_engine.h

    r8186 r9417  
    1616class WorldEntity;
    1717class OBBTree;
    18 class Terrain;
     18class TerrainEntity;
    1919class BspManager;
    2020//class Player;
     
    5050  inline void disable(const int options) { int temp = this->state & options; this->state ^= temp; }
    5151
    52   inline void setTerrain(Terrain* terrain) { this->terrain = terrain; }
     52  inline void setTerrain(TerrainEntity* terrain) { this->terrain = terrain; }
    5353  inline void setBSPModel(BspManager* bspManager) { this->bspManager = bspManager; }
    5454
     
    8383  OBBTree*                rootTree;                         //!< for testing purposes a root tree
    8484
    85   Terrain*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
     85  TerrainEntity*          terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
    8686  BspManager*             bspManager;
    8787};
Note: See TracChangeset for help on using the changeset viewer.