Changeset 4419 in orxonox.OLD

Timestamp:

May 31, 2005, 5:20:49 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: unsubscribtion from events, after object deatch

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• util/event/event_handler.cc (modified) (1 diff)
• util/event/event_handler.h (modified) (1 diff)
• world_entities/camera.cc (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -186 +186 @@
   //delete garbagecollecor
   //delete animator
+  
+  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_UP);
+  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_DOWN);
+  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_LEFT);
+  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_RIGHT);
+  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_FIRE1);
+  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_NEXT_WEAPON);
+  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_PREVIOUS_WEAPON);
+
 
   LoadClassDescription::printAll();

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

@@ -115 +115 @@
 
 
-void EventHandler::unsubscribe(int eventType, elState state)
+void EventHandler::unsubscribe(elState state, int eventType)
 {
   PRINTF(0)("Unsubscribing event type nr: %i\n", eventType);

orxonox/trunk/src/util/event/event_handler.h

@@ -27 +27 @@
 
   void subscribe(EventListener* el, elState state, int eventType);
-  void unsubscribe(int eventType, elState state);
+  void unsubscribe(elState state, int eventType);
   void flush(elState state);
 

orxonox/trunk/src/world_entities/camera.cc

@@ -57 +57 @@
 Camera::~Camera(void)
 {
+  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW0);
+  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW1);
+  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW2);
+  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW3);
+  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW4);
+  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW5);
 }