Changeset 5853 in orxonox.OLD

Timestamp:

Dec 1, 2005, 5:51:59 PM (18 years ago)

Author:

snellen

Message:

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

Location:

branches/spaceshipcontrol/src/world_entities

Files:

• playable.h (modified) (3 diffs)
• player.cc (modified) (3 diffs)

branches/spaceshipcontrol/src/world_entities/playable.h

@@ -9 +9 @@
 #include "world_entity.h"
 #include "event.h"
+#include <list.h>
 
 class Weapon;
@@ -33 +34 @@
 
     virtual void process(const Event &event) = 0;
-
+    virtual void setKeySet();
+    virtual void getKeySet();
     WeaponManager* getWeaponManager();
 
@@ -39 +41 @@
 
     WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
+    std::list<Event*>      events;
+
 
 };

branches/spaceshipcontrol/src/world_entities/player.cc

@@ -57 +57 @@
 
 /**
- * subscribe to all events because the player dosen't know to witch keys the controllable can react
+ * subscribe to all events the controllable needs
  */
 void Player::subscribeEvents()
 {
-  EventHandler* evh = EventHandler::getInstance();
+  /*EventHandler* evh = EventHandler::getInstance();
   for (int i = 1; i < SDLK_LAST; i++)
    {
@@ -67 +67 @@
           evh->subscribe(this, ES_GAME, i);
    }
-
+  */
 }
 
@@ -78 +78 @@
 void Player::setControllable(Playable* controllalble)
  {
+   //todo get keyset an subscribe to the needed keys
    this->controllable = controllable;
  }