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

Timestamp:

Nov 11, 2004, 2:45:54 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the ObjectImporter to trunk: merged with
svn merge branches/importer/src/ trunk/src/ -r 2794:HEAD

File:

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

orxonox/trunk/src/player.h

@@ -8 +8 @@
 
 #include "world_entity.h"
+#include "object.h"
 
 //! Basic controllable WorldEntity
@@ -37 +38 @@
   float acceleration;
   GLuint objectList;
+  Object* obj;
   
   void move (float time);