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

trunk/src/lib/shell/shell_input.cc

@@ -20 +20 @@
 #include "shell_command.h"
 #include "shell_command_class.h"
-#include "event_handler.h"
 
 #include "debug.h"
@@ -50 +49 @@
     this->setRepeatDelay(.3, .05);
 
-    // subscribe all keyboard commands to ES_SEHLL
-    EventHandler* evh = EventHandler::getInstance();
+    // subscribe all keyboard commands to ES_SHELL
     for (int i = 1; i < SDLK_LAST; i++)
     {
-      if (!evh->isSubscribed(ES_SHELL, i))
-        evh->subscribe(this, ES_SHELL, i);
+      if (!this->isEventSubscribed(ES_SHELL, i))
+        this->subscribeEvent(ES_SHELL, i);
     }
     // unsubscribe unused TODO improve.
-    evh->unsubscribe(ES_SHELL, SDLK_BACKQUOTE);
-    evh->unsubscribe(ES_SHELL, SDLK_F12);
-    evh->unsubscribe(ES_SHELL, SDLK_PAGEUP);
-    evh->unsubscribe(ES_SHELL, SDLK_PAGEDOWN);
+    this->unsubscribeEvent(ES_SHELL, SDLK_BACKQUOTE);
+    this->unsubscribeEvent(ES_SHELL, SDLK_F12);
+    this->unsubscribeEvent(ES_SHELL, SDLK_PAGEUP);
+    this->unsubscribeEvent(ES_SHELL, SDLK_PAGEDOWN);
 
   }