Changeset 7866 in orxonox.OLD for branches/gui/src/story_entities
- Timestamp:
- May 26, 2006, 1:11:10 PM (19 years ago)
- Location:
- branches/gui/src/story_entities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/gui/src/story_entities/movie_loader.cc
r7283 r7866 70 70 ErrorMessage MovieLoader::unloadData() 71 71 { 72 EventHandler::getInstance()->unsubscribe(this,ES_GAME);72 this->unsubscribeEvents(ES_GAME); 73 73 } 74 74 -
branches/gui/src/story_entities/simple_game_menu.cc
r7765 r7866 18 18 19 19 #include "simple_game_menu.h" 20 21 #include "event_handler.h" 20 22 21 23 #include "state.h" … … 32 34 #include "camera.h" 33 35 34 #include "event_handler.h"35 36 #include "graphics_engine.h" 36 37 #include "object_manager.h" … … 112 113 GameWorld::init(); 113 114 114 EventHandler::getInstance()->subscribe(this,ES_MENU, SDLK_UP);115 EventHandler::getInstance()->subscribe(this,ES_MENU, SDLK_DOWN);116 EventHandler::getInstance()->subscribe(this,ES_MENU, SDLK_RETURN);117 EventHandler::getInstance()->subscribe(this,ES_MENU, SDLK_SPACE);118 EventHandler::getInstance()->subscribe(this,ES_MENU, SDLK_ESCAPE);115 this->subscribeEvent(ES_MENU, SDLK_UP); 116 this->subscribeEvent(ES_MENU, SDLK_DOWN); 117 this->subscribeEvent(ES_MENU, SDLK_RETURN); 118 this->subscribeEvent(ES_MENU, SDLK_SPACE); 119 this->subscribeEvent(ES_MENU, SDLK_ESCAPE); 119 120 120 121 this->dataTank->localCamera->setRelCoor(this->cameraVector); … … 253 254 ErrorMessage SimpleGameMenu::unloadData() 254 255 { 255 EventHandler::getInstance()->unsubscribe(this,ES_MENU);256 this->unsubscribeEvents(ES_MENU); 256 257 257 258 std::vector<MenuLayer>::iterator mit;
Note: See TracChangeset
for help on using the changeset viewer.