Changeset 5839 in orxonox.OLD for branches/spaceshipcontrol/src/world_entities/player.h

Timestamp:

Nov 30, 2005, 9:40:41 PM (18 years ago)

Author:

snellen

Message:

player.cc and player.h changed (both files in ../src/world_entities)

File:

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

branches/spaceshipcontrol/src/world_entities/player.h

@@ -10 +10 @@
 #include "physics_interface.h"
 #include "event_listener.h"
+#include "playable.h"
 
-template<class T> class tList;
-class Weapon;
-class WeaponManager;
-class Vector;
-class Event;
 
 //! Basic controllable WorldEntity
@@ -23 +19 @@
      the player.cc for debug also
 */
-class Player : public WorldEntity, public EventListener
+class Player : public EventListener
 {
-  friend class World;
 
   public:
     Player();
-    Player(const char* fileName);
-    Player(const TiXmlElement* root);
     virtual ~Player();
 
     void init();
-    void loadParams(const TiXmlElement* root);
-
-    void addWeapon(Weapon* weapon);
-    void removeWeapon(Weapon* weapon);
-
-    virtual void postSpawn();
-    virtual void leftWorld();
-
-    virtual void collidesWith(WorldEntity* entity, const Vector& location);
-    virtual void tick(float time);
-    virtual void draw() const;
 
     virtual void process(const Event &event);
@@ -50 +32 @@
 
   private:
-    void move(float time);
-    void weaponAction();
+    Playable* controllable;
 
-    // !! temporary !!
-    void ADDWEAPON();
 
-  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.
-
-    WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
-
-    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.
 };