Changeset 5877 in orxonox.OLD

Timestamp:

Dec 2, 2005, 4:27:53 PM (19 years ago)

Author:

bensch

Message:

controll: registerEvent

Location:

branches/spaceshipcontrol/src/world_entities

Files:

• playable.cc (modified) (1 diff)
• playable.h (modified) (1 diff)

branches/spaceshipcontrol/src/world_entities/playable.cc

@@ -44 +44 @@
   /*EventHandler*/
   EventHandler* evh = EventHandler::getInstance();
-  std::list<Event*>::iterator ev;
+  std::list<int>::iterator ev;
   for (ev = this->events.begin(); ev != events.end(); ev++)
   {
-    if (!evh->isSubscribed(ES_GAME, (*ev)->type))
-      evh->subscribe(player, ES_GAME, (*ev)->type);
+    evh->subscribe(player, ES_GAME, (*ev));
   }
 

branches/spaceshipcontrol/src/world_entities/playable.h

@@ -35 +35 @@
     virtual void process(const Event &event) {} //= 0;
     virtual void setKeySet() {};
-    inline const std::list<Event*>& getEventList() { return this->events; };
+    inline const std::list<int>& getEventList() { return this->events; };
 
+  protected:
+    void registerEvent(int eventType);
 
   private:
 
     WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
-    std::list<Event*>     events;
+    std::list<int>        events;
     //todo: add a event to id mapping list