Changeset 4818 in orxonox.OLD

Timestamp:

Jul 7, 2005, 5:24:34 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: crosshair gets deleted also, now all event listeners are removed at the end

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (5 diffs)
• player.h (modified) (3 diffs)
• weapons/crosshair.cc (modified) (1 diff)

orxonox/trunk/src/world_entities/player.cc

@@ -35 +35 @@
 #include "crosshair.h"
 
-Crosshair* test;
+
 
 using namespace std;
@@ -63 +63 @@
   this->weaponMan->addWeapon(wpRight, W_CONFIG2);
   this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
-
 }
 
@@ -77 +76 @@
   */
   delete this->weaponMan;
+  delete this->crosshair;
 }
 
@@ -102 +102 @@
 
 
-  test = new Crosshair();
+  this->crosshair = new Crosshair();
 }
 
@@ -198 +198 @@
 void Player::draw ()
 {
-  test->draw();
+  this->crosshair->draw();
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();

orxonox/trunk/src/world_entities/player.h

@@ -2 +2 @@
     \file player.h
     \brief Implements a basic controllable WorldEntity
-*/
+ */
 
 #ifndef _PLAYER_H
@@ -17 +17 @@
 class World;
 class Event;
+class Crosshair;
 
 //! Basic controllable WorldEntity
@@ -23 +24 @@
   friend class World;
 
- public:
-  Player();
-  Player(const TiXmlElement* root);
-  virtual ~Player();
+  public:
+    Player();
+    Player(const TiXmlElement* root);
+    virtual ~Player();
 
-  void init();
-  void loadParams(const TiXmlElement* root);
+    void init();
+    void loadParams(const TiXmlElement* root);
 
-  void addWeapon(Weapon* weapon);
-  void removeWeapon(Weapon* weapon);
+    void addWeapon(Weapon* weapon);
+    void removeWeapon(Weapon* weapon);
 
-  virtual void postSpawn();
-  virtual void leftWorld();
-  virtual void hit(WorldEntity* weapon, Vector* loc);
-  virtual void collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags);
+    virtual void postSpawn();
+    virtual void leftWorld();
+    virtual void hit(WorldEntity* weapon, Vector* loc);
+    virtual void collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags);
 
-  virtual void tick(float time);
-  virtual void draw();
+    virtual void tick(float time);
+    virtual void draw();
 
-  virtual void command(Command* cmd);
+    virtual void command(Command* cmd);
 
-  virtual void process(const Event &event);
+    virtual void process(const Event &event);
 
- 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
 
-  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
+  private:
+    void move(float time);
+    void weapon();
 
-  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.
+  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
 
-  void move(float time);
-  void weapon();
+    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
+
+    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
 
 };

orxonox/trunk/src/world_entities/weapons/crosshair.cc

@@ -46 +46 @@
 {
   // delete what has to be deleted here
+  EventHandler::getInstance()->unsubscribe(this);
 }