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

Timestamp:

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

Author:

bensch

Message:

Events are subscribed at the EventListener, and not the EventHandler

Location:

branches/gui/src/world_entities

Files:

• camera.cc (modified) (1 diff)
• playable.cc (modified) (5 diffs)
• player.cc (modified) (1 diff)
• weapons/crosshair.cc (modified) (1 diff)

branches/gui/src/world_entities/camera.cc

@@ -31 +31 @@
   this->target = new CameraTarget();
 
-  EventHandler::getInstance()->subscribe(this, ES_GAME, KeyMapper::PEV_VIEW0);
-  EventHandler::getInstance()->subscribe(this, ES_GAME, KeyMapper::PEV_VIEW1);
-  EventHandler::getInstance()->subscribe(this, ES_GAME, KeyMapper::PEV_VIEW2);
-  EventHandler::getInstance()->subscribe(this, ES_GAME, KeyMapper::PEV_VIEW3);
-  EventHandler::getInstance()->subscribe(this, ES_GAME, KeyMapper::PEV_VIEW4);
-  EventHandler::getInstance()->subscribe(this, ES_GAME, KeyMapper::PEV_VIEW5);
+  this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW0);
+  this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW1);
+  this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW2);
+  this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW3);
+  this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW4);
+  this->subscribeEvent(ES_GAME, KeyMapper::PEV_VIEW5);
 
   this->setFovy(90);

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);
 }
 

branches/gui/src/world_entities/player.cc

@@ -40 +40 @@
   this->hud.show();
 
-  EventHandler::getInstance()->subscribe(this, ES_GAME, KeyMapper::PEV_CHANGE_SHIP);
+  this->subscribeEvent(ES_GAME, KeyMapper::PEV_CHANGE_SHIP);
 }
 

branches/gui/src/world_entities/weapons/crosshair.cc

@@ -65 +65 @@
   this->material = new Material;
 
-  //EventHandler::getInstance()->subscribe(this, ES_GAME, EV_MOUSE_MOTION);
+  //this->subscribeEvent(ES_GAME, EV_MOUSE_MOTION);
 
   // center the mouse on the screen, and also hide the cursors