Changeset 7866 in orxonox.OLD for branches/gui/src/world_entities/playable.cc

Timestamp:

May 26, 2006, 1:11:10 PM (18 years ago)

Author:

bensch

Message:

Events are subscribed at the EventListener, and not the EventHandler

File:

• branches/gui/src/world_entities/playable.cc (modified) (5 diffs)

branches/gui/src/world_entities/playable.cc

@@ -16 +16 @@
 
 #include "playable.h"
-#include "event_handler.h"
+
+#include "key_mapper.h"
 
 #include "player.h"
@@ -225 +226 @@
 
     // unsubscibe all events.
-    EventHandler* evh = EventHandler::getInstance();
     std::vector<int>::iterator ev;
     for (ev = this->events.begin(); ev != events.end(); ev++)
-      evh->unsubscribe( ES_GAME, (*ev));
+      player->unsubscribeEvent(ES_GAME, (*ev));
 
     // leave the entity
@@ -251 +251 @@
 
     /*EventHandler*/
-    EventHandler* evh = EventHandler::getInstance();
     std::vector<int>::iterator ev;
     for (ev = this->events.begin(); ev != events.end(); ev++)
-      evh->subscribe(player, ES_GAME, (*ev));
+      player->subscribeEvent(ES_GAME, (*ev));
 
     this->enter();
@@ -440 +439 @@
 
   if (this->currentPlayer != NULL)
-    EventHandler::getInstance()->subscribe(this->currentPlayer, ES_GAME, eventType);
+    this->currentPlayer->subscribeEvent(ES_GAME, eventType);
 }
 
@@ -453 +452 @@
 
   if (this->currentPlayer != NULL)
-    EventHandler::getInstance()->unsubscribe(ES_GAME, eventType);
+    this->currentPlayer->unsubscribeEvent(ES_GAME, eventType);
 }