diff options
author | Christopher Page | 2008-07-07 23:47:39 +0000 |
---|---|---|
committer | Christopher Page | 2008-07-07 23:47:39 +0000 |
commit | 41938b7644d2f1937f28641eac68218515e1f058 (patch) | |
tree | b6bd2e45a955ec6bcf6bbb6c141ec374e64258b0 | |
parent | 61d25a912ed1a8ca864e7c4dc564624947f3b2fe (diff) | |
download | scummvm-rg350-41938b7644d2f1937f28641eac68218515e1f058.tar.gz scummvm-rg350-41938b7644d2f1937f28641eac68218515e1f058.tar.bz2 scummvm-rg350-41938b7644d2f1937f28641eac68218515e1f058.zip |
CINE works with the new GMM implementation
svn-id: r32954
-rw-r--r-- | engines/cine/anim.cpp | 3 | ||||
-rw-r--r-- | engines/cine/cine.cpp | 2 | ||||
-rw-r--r-- | engines/cine/main_loop.cpp | 6 | ||||
-rw-r--r-- | engines/cine/prc.cpp | 3 | ||||
-rw-r--r-- | engines/cine/various.cpp | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp index feafaa315b..b06dbd4576 100644 --- a/engines/cine/anim.cpp +++ b/engines/cine/anim.cpp @@ -28,6 +28,7 @@ */ #include "common/endian.h" +#include "common/events.h" #include "common/stream.h" #include "cine/cine.h" @@ -731,7 +732,7 @@ void loadResource(const char *resourceName) { loadSeq(resourceName, -1); return; } else if (strstr(resourceName, "ECHEC")) { // Echec (French) means failure - g_cine->_quit = 1; + g_system->getEventManager()->pushEvent(Common::EVENT_QUIT); return; } diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp index 29dd47c1f6..8b06abc166 100644 --- a/engines/cine/cine.cpp +++ b/engines/cine/cine.cpp @@ -103,7 +103,7 @@ int CineEngine::go() { delete[] page3Raw; delete g_sound; - return _rtl; + return _eventMan->shouldRTL(); } diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp index 54925e3df1..b42134eb0b 100644 --- a/engines/cine/main_loop.cpp +++ b/engines/cine/main_loop.cpp @@ -62,7 +62,7 @@ static void processEvent(Common::Event &event) { case Common::EVENT_MOUSEMOVE: break; case Common::EVENT_QUIT: - g_cine->_quit = 1; + g_system->getEventManager()->pushEvent(Common::EVENT_QUIT); break; case Common::EVENT_KEYDOWN: switch (event.kbd.keycode) { @@ -292,7 +292,7 @@ void CineEngine::mainLoop(int bootScriptIdx) { if ("quit"[menuCommandLen] == (char)di) { ++menuCommandLen; if (menuCommandLen == 4) { - g_cine->_quit = 1; + g_system->getEventManager()->pushEvent(Common::EVENT_QUIT); } } else { menuCommandLen = 0; @@ -301,7 +301,7 @@ void CineEngine::mainLoop(int bootScriptIdx) { manageEvents(); - } while (!g_cine->_quit && _danKeysPressed != 7); + } while (!_eventMan->shouldQuit() && _danKeysPressed != 7); hideMouse(); g_sound->stopMusic(); diff --git a/engines/cine/prc.cpp b/engines/cine/prc.cpp index d636479b02..4df82478cd 100644 --- a/engines/cine/prc.cpp +++ b/engines/cine/prc.cpp @@ -25,6 +25,7 @@ #include "common/endian.h" +#include "common/events.h" #include "cine/cine.h" #include "cine/various.h" @@ -53,7 +54,7 @@ void loadPrc(const char *pPrcName) { // This is copy protection. Used to hang the machine if (!scumm_stricmp(pPrcName, "L201.ANI")) { - g_cine->_quit = 1; + g_system->getEventManager()->pushEvent(Common::EVENT_QUIT); return; } diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp index d8091c6b86..23891cb667 100644 --- a/engines/cine/various.cpp +++ b/engines/cine/various.cpp @@ -756,7 +756,7 @@ void CineEngine::makeSystemMenu(void) { { getMouseData(mouseUpdateStatus, (uint16 *)&mouseButton, (uint16 *)&mouseX, (uint16 *)&mouseY); if (!makeMenuChoice(confirmMenu, 2, mouseX, mouseY + 8, 100)) { - _quit = 1; + g_system->getEventManager()->pushEvent(Common::EVENT_QUIT); } break; } |