Changeset 4877 in orxonox.OLD for orxonox/branches/weaponSystem/src/world_entities/player.h

Timestamp:

Jul 16, 2005, 10:38:04 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/weaponSystem: cleanup WorldEntity and Player (or at least started cleaning up)

File:

• orxonox/branches/weaponSystem/src/world_entities/player.h (modified) (4 diffs)

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

@@ -1 +1 @@
 /*!
-    \file player.h
-  *  Implements a basic controllable WorldEntity
+ * @file player.h
+ * Implements a basic controllable WorldEntity
  */
 
@@ -15 +15 @@
 class WeaponManager;
 class Vector;
-class World;
 class Event;
-class Crosshair;
 
 //! Basic controllable WorldEntity
+/**
+  *  this is the debug player - actualy we would have to make a new
+     class derivated from Player for each player. for now, we just use
+     the player.cc for debug also
+*/
 class Player : public WorldEntity, public PhysicsInterface, public EventListener
 {
@@ -43 +46 @@
     virtual void draw();
 
-    virtual void command(Command* cmd);
-
     virtual void process(const Event &event);
 
@@ -50 +51 @@
   private:
     void move(float time);
-    void weapon();
+    void weaponAction();
 
 
   private:
-    bool bUp;              //!< up button pressed.
-    bool bDown;            //!< down button pressed.
-    bool bLeft;            //!< left button pressed.
-    bool bRight;           //!< right button pressed.
-    bool bAscend;          //!< ascend button pressed.
-    bool bDescend;         //!< descend button presses.
-    bool bFire;            //!< fire button pressed.
-    bool bWeaponChange;    //!< weapon change button pressed
+    bool                  bUp;                //!< up button pressed.
+    bool                  bDown;              //!< down button pressed.
+    bool                  bLeft;              //!< left button pressed.
+    bool                  bRight;             //!< right button pressed.
+    bool                  bAscend;            //!< ascend button pressed.
+    bool                  bDescend;           //!< descend button presses.
+    bool                  bFire;              //!< fire button pressed.
+    bool                  bWeaponChange;      //!< weapon change button pressed
 
-    tList<Weapon>* weapons;//!< a list of weapon
-    Weapon* activeWeapon;  //!< the weapon that is currenty activated
-    Weapon* activeWeaponL;  //temporary -- FIX THIS
-    WeaponManager* weaponMan; //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
+    WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
 
-    World* myWorld;        //!< reference to the world object
-
-    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.
-
-    Crosshair*  crosshair; //!< the crosshair 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.
 };