Changeset 5968 in orxonox.OLD for branches/network/src/lib/collision_detection/cd_engine.h

Timestamp:

Dec 7, 2005, 4:16:51 PM (18 years ago)

Author:

patrick

Message:

network: merged the trunk into the network with the command svn merge -r5824:HEAD ../trunk network, changes changed… bla bla..

File:

• branches/network/src/lib/collision_detection/cd_engine.h (modified) (3 diffs)

branches/network/src/lib/collision_detection/cd_engine.h

@@ -17 +17 @@
 class OBBTree;
 class Terrain;
-class Player;
+//class Player;
 
 
@@ -51 +51 @@
   inline void setEntityList(tList<WorldEntity>* entityList) { this->entityList = entityList; }
   inline void setTerrain(Terrain* terrain) { this->terrain = terrain; }
-  inline void setPlayer(Player* player) { this->player = player; } /* only for debug purposes \todo: delete*/
+  //  inline void setPlayer(Player* player) { this->player = player; } /* only for debug purposes \todo: delete*/
 
   void drawBV(int depth, int drawMode) const;
@@ -79 +79 @@
 
   Terrain*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
-  Player*                 player;
+//  Player*                 player;
 };