Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/world_entities/player.h

Timestamp:

Apr 7, 2005, 3:54:49 PM (20 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Merged trunk into branch… still not working though…

File:

• orxonox/branches/levelloader/src/world_entities/player.h (modified) (3 diffs)

orxonox/branches/levelloader/src/world_entities/player.h

@@ -10 +10 @@
 
 template<class T> class tList;
-class OBJModel;
 class Weapon;
+class Vector;
+class World;
 
 //! Basic controllable WorldEntity
@@ -19 +20 @@
   
  public:
-  Player(bool isFree = false);
+  Player();
   Player(TiXmlElement* root);
   virtual ~Player();
@@ -48 +49 @@
   tList<Weapon>* weapons;//!< a list of weapon
   Weapon* activeWeapon;  //!< the weapon that is currenty activated
+  World* myWorld;        //!< reference to the world object
 
-  Vector velocity;       //!< the velocity of the player.
+  Vector* velocity;       //!< the velocity of the player.
   float travelSpeed;     //!< the current speed of the player (to make soft movement)
   float acceleration;    //!< the acceleration of the player.
   
   void move(float time);
-  void fire(void);
+  void weapon(void);
   
 };