Changeset 7868 in orxonox.OLD for trunk/src/lib/shell/shell.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/lib/shell/shell.cc (modified) (1 diff)

trunk/src/lib/shell/shell.cc

@@ -65 +65 @@
 
     // EVENT-Handler subscription of '`' to all States.
-    EventHandler::getInstance()->subscribe(this, ES_ALL, SDLK_BACKQUOTE);
-    EventHandler::getInstance()->subscribe(this, ES_ALL, SDLK_F12);
-    EventHandler::getInstance()->subscribe(this, ES_SHELL, SDLK_PAGEUP);
-    EventHandler::getInstance()->subscribe(this, ES_SHELL, SDLK_PAGEDOWN);
-    EventHandler::getInstance()->subscribe(this, ES_SHELL, EV_VIDEO_RESIZE);
+    this->subscribeEvent(ES_ALL, SDLK_BACKQUOTE);
+    this->subscribeEvent(ES_ALL, SDLK_F12);
+    this->subscribeEvent(ES_SHELL, SDLK_PAGEUP);
+    this->subscribeEvent(ES_SHELL, SDLK_PAGEDOWN);
+    this->subscribeEvent(ES_SHELL, EV_VIDEO_RESIZE);
 
     // BUFFER