Changeset 9417 in orxonox.OLD for branches/terrain/src/lib/collision_detection
- Timestamp:
- Jul 24, 2006, 1:23:47 PM (18 years ago)
- 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 24 24 #include "model.h" 25 25 #include "world_entity.h" 26 #include "terrain .h"26 #include "terrain_entity.h" 27 27 // #include "player.h" 28 28 -
branches/terrain/src/lib/collision_detection/cd_engine.h
r8186 r9417 16 16 class WorldEntity; 17 17 class OBBTree; 18 class Terrain ;18 class TerrainEntity; 19 19 class BspManager; 20 20 //class Player; … … 50 50 inline void disable(const int options) { int temp = this->state & options; this->state ^= temp; } 51 51 52 inline void setTerrain(Terrain * terrain) { this->terrain = terrain; }52 inline void setTerrain(TerrainEntity* terrain) { this->terrain = terrain; } 53 53 inline void setBSPModel(BspManager* bspManager) { this->bspManager = bspManager; } 54 54 … … 83 83 OBBTree* rootTree; //!< for testing purposes a root tree 84 84 85 Terrain *terrain; //!< this it a ref to the terrain, serving as a ground for all WE85 TerrainEntity* terrain; //!< this it a ref to the terrain, serving as a ground for all WE 86 86 BspManager* bspManager; 87 87 };
Note: See TracChangeset
for help on using the changeset viewer.