Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7866 in orxonox.OLD for branches/gui/src/story_entities


Ignore:
Timestamp:
May 26, 2006, 1:11:10 PM (19 years ago)
Author:
bensch
Message:

Events are subscribed at the EventListener, and not the EventHandler

Location:
branches/gui/src/story_entities
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/gui/src/story_entities/movie_loader.cc

    r7283 r7866  
    7070ErrorMessage MovieLoader::unloadData()
    7171{
    72   EventHandler::getInstance()->unsubscribe(this, ES_GAME);
     72  this->unsubscribeEvents(ES_GAME);
    7373}
    7474
  • branches/gui/src/story_entities/simple_game_menu.cc

    r7765 r7866  
    1818
    1919#include "simple_game_menu.h"
     20
     21#include "event_handler.h"
    2022
    2123#include "state.h"
     
    3234#include "camera.h"
    3335
    34 #include "event_handler.h"
    3536#include "graphics_engine.h"
    3637#include "object_manager.h"
     
    112113  GameWorld::init();
    113114
    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);
    119120
    120121  this->dataTank->localCamera->setRelCoor(this->cameraVector);
     
    253254ErrorMessage SimpleGameMenu::unloadData()
    254255{
    255   EventHandler::getInstance()->unsubscribe(this, ES_MENU);
     256  this->unsubscribeEvents(ES_MENU);
    256257
    257258  std::vector<MenuLayer>::iterator mit;
Note: See TracChangeset for help on using the changeset viewer.