Changeset 4866 in orxonox.OLD for orxonox/trunk/src/lib/event/event_handler.cc

Timestamp:

Jul 14, 2005, 10:38:21 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Iniparser is passed on to the EvenetHandler over orxonox

File:

• orxonox/trunk/src/lib/event/event_handler.cc (modified) (3 diffs)

orxonox/trunk/src/lib/event/event_handler.cc

@@ -63 +63 @@
 EventHandler::~EventHandler ()
 {
-  EventHandler::singletonRef = NULL;
-  delete this->keyMapper;
-
   for(int i = 0; i < ES_NUMBER; ++i)
   {
-    for(int j = 0; j < SDLK_LAST; ++j)
+    for(int j = 0; j < EV_NUMBER; ++j)
     {
       if( this->listeners[i][j] != NULL)
@@ -76 +73 @@
     }
   }
+  delete this->keyMapper;
+  EventHandler::singletonRef = NULL;
 }
 
@@ -84 +83 @@
    this has to be called before the use of the event handler
 */
-void EventHandler::init()
+void EventHandler::init(IniParser* iniParser)
 {
   this->keyMapper = new KeyMapper();
-  this->keyMapper->loadKeyBindings();
+  this->keyMapper->loadKeyBindings(iniParser);
 }