Changeset 7868 in orxonox.OLD for trunk/src/story_entities/simple_game_menu.cc

Timestamp:

May 26, 2006, 1:21:32 PM (18 years ago)

Author:

bensch

Message:

trunk: merge Check in the Event-changes:
r7867 | bensch | 2006-05-26 13:19:46 +0200 (Fri, 26 May 2006) | 1 line

Events better subscribed

---

r7866 | bensch | 2006-05-26 13:11:10 +0200 (Fri, 26 May 2006) | 1 line

Events are subscribed at the EventListener, and not the EventHandler

File:

• trunk/src/story_entities/simple_game_menu.cc (modified) (4 diffs)

trunk/src/story_entities/simple_game_menu.cc

@@ -18 +18 @@
 
 #include "simple_game_menu.h"
+
+#include "event_handler.h"
 
 #include "state.h"
@@ -32 +34 @@
 #include "camera.h"
 
-#include "event_handler.h"
 #include "graphics_engine.h"
 #include "object_manager.h"
@@ -112 +113 @@
   GameWorld::init();
 
-  EventHandler::getInstance()->subscribe(this, ES_MENU, SDLK_UP);
-  EventHandler::getInstance()->subscribe(this, ES_MENU, SDLK_DOWN);
-  EventHandler::getInstance()->subscribe(this, ES_MENU, SDLK_RETURN);
-  EventHandler::getInstance()->subscribe(this, ES_MENU, SDLK_SPACE);
-  EventHandler::getInstance()->subscribe(this, ES_MENU, SDLK_ESCAPE);
+  this->subscribeEvent(ES_MENU, SDLK_UP);
+  this->subscribeEvent(ES_MENU, SDLK_DOWN);
+  this->subscribeEvent(ES_MENU, SDLK_RETURN);
+  this->subscribeEvent(ES_MENU, SDLK_SPACE);
+  this->subscribeEvent(ES_MENU, SDLK_ESCAPE);
 
   this->dataTank->localCamera->setRelCoor(this->cameraVector);
@@ -253 +254 @@
 ErrorMessage SimpleGameMenu::unloadData()
 {
-  EventHandler::getInstance()->unsubscribe(this, ES_MENU);
+  this->unsubscribeEvents(ES_MENU);
 
   std::vector<MenuLayer>::iterator mit;