Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4419 in orxonox.OLD for orxonox


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/story_entities/world.cc

    r4418 r4419  
    186186  //delete garbagecollecor
    187187  //delete animator
     188 
     189  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_UP);
     190  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_DOWN);
     191  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_LEFT);
     192  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_RIGHT);
     193  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_FIRE1);
     194  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_NEXT_WEAPON);
     195  this->eventHandler->unsubscribe(ES_GAME, KeyMapper::PEV_PREVIOUS_WEAPON);
     196
    188197
    189198  LoadClassDescription::printAll();
  • orxonox/trunk/src/util/event/event_handler.cc

    r4417 r4419  
    115115
    116116
    117 void EventHandler::unsubscribe(int eventType, elState state)
     117void EventHandler::unsubscribe(elState state, int eventType)
    118118{
    119119  PRINTF(0)("Unsubscribing event type nr: %i\n", eventType);
  • orxonox/trunk/src/util/event/event_handler.h

    r4407 r4419  
    2727
    2828  void subscribe(EventListener* el, elState state, int eventType);
    29   void unsubscribe(int eventType, elState state);
     29  void unsubscribe(elState state, int eventType);
    3030  void flush(elState state);
    3131
  • orxonox/trunk/src/world_entities/camera.cc

    r4414 r4419  
    5757Camera::~Camera(void)
    5858{
     59  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW0);
     60  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW1);
     61  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW2);
     62  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW3);
     63  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW4);
     64  EventHandler::getInstance()->unsubscribe(ES_GAME, KeyMapper::PEV_VIEW5);
    5965}
    6066
Note: See TracChangeset for help on using the changeset viewer.