libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 06:08:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CINE works with the new GMM implementation

Browse Source 
svn-id: r32954
This commit is contained in:
Christopher Page 2008-07-07 23:47:39 +00:00
parent 61d25a912e
commit 41938b7644
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/cine/anim.cpp
View File

@ -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;
}

2
engines/cine/cine.cpp
View File

@ -103,7 +103,7 @@ int CineEngine::go() {
delete[] page3Raw;
delete g_sound;
return _rtl;
return _eventMan->shouldRTL();
}

6
engines/cine/main_loop.cpp
View File

@ -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();

3
engines/cine/prc.cpp
View File

@ -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;
}

2
engines/cine/various.cpp
View File

@ -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;
}