Changeset 4411 in orxonox.OLD

Timestamp:

May 31, 2005, 12:58:32 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now system events work again: quit, pause, next-level

Location:

orxonox/trunk/src/util

Files:

• event/key_mapper.cc (modified) (1 diff)
• loading/game_loader.cc (modified) (2 diffs)
• loading/game_loader.h (modified) (2 diffs)

orxonox/trunk/src/util/event/key_mapper.cc

@@ -206 +206 @@
     {
       if( !strcmp (name, map[i].pName)) { *map[i].pValue = keyID; break;}
+      PRINTF(0)("Mapping %s to id %i\n", name, keyID);
     }
 }

orxonox/trunk/src/util/loading/game_loader.cc

@@ -65 +65 @@
   if(this->currentCampaign != NULL)
     this->currentCampaign->init();
+
+  this->eventHandler = EventHandler::getInstance();
+  this->eventHandler->subscribe(this, ES_ALL, KeyMapper::PEV_PAUSE);
+  this->eventHandler->subscribe(this, ES_ALL, KeyMapper::PEV_QUIT);
+  this->eventHandler->subscribe(this, ES_ALL, KeyMapper::PEV_NEXT_WORLD);
+  this->eventHandler->subscribe(this, ES_ALL, KeyMapper::PEV_PREVIOUS_WORLD);
 }
 
@@ -258 +264 @@
 
 
+
+
 void GameLoader::process(const Event& event)
 {

orxonox/trunk/src/util/loading/game_loader.h

@@ -24 +24 @@
 class BaseObject;
 class Event;
+class EventHandler;
 
 //! The GameLoader
@@ -72 +73 @@
   
   Campaign* fileToCampaign(const char* name);
+  EventHandler* eventHandler;
 
   Factory* first;