Changeset 5915 in orxonox.OLD for trunk/src/world_entities/player.h

Timestamp:

Dec 4, 2005, 3:34:36 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/spaceshipControll back to the trunk:
merged with command:
svn merge -r5835:HEAD branches/spaceshipcontroll trunk
conflicts resolved with dynamic indentation methodology algorithms

File:

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

trunk/src/world_entities/player.h

@@ -7 +7 @@
 #define _PLAYER_H
 
-#include "world_entity.h"
-#include "physics_interface.h"
 #include "event_listener.h"
 
-template<class T> class tList;
-class Weapon;
-class WeaponManager;
-class Vector;
-class Event;
+/* Forward Declaration */
+class Playable;
 
 //! Basic controllable WorldEntity
@@ -23 +18 @@
      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);
+    bool              setControllable(Playable* controllalble);
+    inline Playable*  getControllable() { return this->controllable; };
 
-    void addWeapon(Weapon* weapon);
-    void removeWeapon(Weapon* weapon);
+    bool              disconnectControllable();
 
-    virtual void postSpawn();
-    virtual void leftWorld();
+    // eventListener extension.
+    virtual void      process(const Event &event);
 
-    virtual void collidesWith(WorldEntity* entity, const Vector& location);
-    virtual void tick(float time);
-    virtual void draw() const;
-
-    virtual void process(const Event &event);
+  private:
+    void              init();
 
 
   private:
-    void move(float time);
-    void weaponAction();
-
-    // !! 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.
+    Playable*         controllable;                  //!< The one we controll or NULL if none
 };