Changeset 3399 in orxonox.OLD for orxonox/branches/nico/src/player.h

Timestamp:

Feb 6, 2005, 11:27:25 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/nico: merged trunk into branches/nico
merged with command:
svn merge ../trunk/ nico/ -r 3238:HEAD
resolved conflict in favor of branches/nico.

Location:

orxonox/branches/nico

Files:

• . (modified) (1 prop)
• src/player.h (modified) (3 diffs)

orxonox/branches/nico/src/player.h

@@ -8 +8 @@
 
 #include "world_entity.h"
-#include "importer/object.h"
+
+class OBJModel;
 
 //! 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);