Changeset 3365 in orxonox.OLD for orxonox/trunk/src/player.h

Timestamp:

Jan 7, 2005, 1:14:33 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/parenting back to the.
merged with command:
svn merge branches/parenting trunk -r 3247:HEAD
resolved all conflicts in favor of parenting.

File:

• orxonox/trunk/src/player.h (modified) (3 diffs)

orxonox/trunk/src/player.h

@@ -8 +8 @@
 
 #include "world_entity.h"
-#include "importer/object.h"
+
+class Model;
 
 //! Basic controllable WorldEntity
@@ -27 +28 @@
   
   virtual void draw();
-  virtual void getLookat(Location* locbuf);
+  // virtual void getLookat(Location* locbuf);
   
   virtual void leftWorld();
@@ -38 +39 @@
   float acceleration;
   GLuint objectList;
-  Object* obj;
   
   void move(float time);