diff options
author | Gregory Montoir | 2007-04-01 17:36:13 +0000 |
---|---|---|
committer | Gregory Montoir | 2007-04-01 17:36:13 +0000 |
commit | 5aca9dce8c6cce89df3147a6f942620155010c8d (patch) | |
tree | 28dbee0d5addb8e49c839e5eba11733b0fe26fa5 /engines/kyra/gui.cpp | |
parent | 852971cfe62b59ff1f2e7451402a34fa6f8db958 (diff) | |
download | scummvm-rg350-5aca9dce8c6cce89df3147a6f942620155010c8d.tar.gz scummvm-rg350-5aca9dce8c6cce89df3147a6f942620155010c8d.tar.bz2 scummvm-rg350-5aca9dce8c6cce89df3147a6f942620155010c8d.zip |
added the instance of EventManager returned by OSystem::getEventManager as a member of the Engine base class. This allows to simply the code a bit and should more efficient too (ie. less virtual function chain calls, obj->getA()->getB()). Also updated several engines to make use of it.
svn-id: r26357
Diffstat (limited to 'engines/kyra/gui.cpp')
-rw-r--r-- | engines/kyra/gui.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index 3573157277..c9b8b045c2 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -811,8 +811,7 @@ void KyraEngine::gui_getInput() { uint32 now = _system->getMillis(); _mouseWheel = 0; - Common::EventManager *eventMan = _system->getEventManager(); - while (eventMan->pollEvent(event)) { + while (_eventMan->pollEvent(event)) { switch (event.type) { case Common::EVENT_QUIT: quitGame(); @@ -1487,8 +1486,7 @@ void KyraEngine::gui_updateMainMenuAnimation() { bool KyraEngine::gui_mainMenuGetInput() { Common::Event event; - Common::EventManager *eventMan = _system->getEventManager(); - while (eventMan->pollEvent(event)) { + while (_eventMan->pollEvent(event)) { switch (event.type) { case Common::EVENT_QUIT: quitGame(); |