Changeset 4420 in orxonox.OLD for orxonox/trunk/src/story_entities/world.cc

Timestamp:

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

Author:

patrick

Message:

orxonox/trunk: faster and easier unsubscribe function implemented

File:

• orxonox/trunk/src/story_entities/world.cc (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -171 +171 @@
 {
   PRINTF(3)("World::~World() - deleting current world\n");
-  CommandNode* cn = Orxonox::getInstance()->getLocalInput();
-  cn->unbind(this->localPlayer);
-  cn->reset();
+
+  this->eventHandler->unsubscribe(this->localPlayer);
 
   delete WorldInterface::getInstance();
@@ -186 +185 @@
   //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();