libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 01:57:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add more shouldQuit checks in event loops.

Browse Source 
svn-id: r44230
This commit is contained in:
Johannes Schickel 2009-09-21 01:15:11 +00:00
parent 94e359d3fb
commit 756659b00e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/cine/various.cpp
View File

@ -694,7 +694,7 @@ int16 makeMenuChoice(const CommandeType commandList[], uint16 height, uint16 X,
do {
manageEvents();
getMouseData(mouseUpdateStatus, &button, &dummyU16, &dummyU16);
} while (button);
} while (button && !g_cine->shouldQuit());
var_A = 0;
@ -764,7 +764,7 @@ int16 makeMenuChoice(const CommandeType commandList[], uint16 height, uint16 X,
// }
}
} while (!var_A);
} while (!var_A && !g_cine->shouldQuit());
assert(!needMouseSave);
@ -775,7 +775,7 @@ int16 makeMenuChoice(const CommandeType commandList[], uint16 height, uint16 X,
do {
manageEvents();
getMouseData(mouseUpdateStatus, &button, &dummyU16, &dummyU16);
} while (button);
} while (button && !g_cine->shouldQuit());
if (var_4 == 2) { // recheck
if (!recheckValue)
@ -860,7 +860,7 @@ uint16 executePlayerInput(void) {
do {
manageEvents();
getMouseData(mouseUpdateStatus, &mouseButton, &dummyU16, &dummyU16);
} while (mouseButton);
} while (mouseButton && !g_cine->shouldQuit());
si = getObjectUnderCursor(mouseX,
mouseY);
@ -976,7 +976,7 @@ uint16 executePlayerInput(void) {
di = 0;
getMouseData(mouseUpdateStatus, &mouseButton, &mouseX, &mouseY);
while (mouseButton) {
while (mouseButton && !g_cine->shouldQuit()) {
if (mouseButton & 1) {
di |= 1;
}
@ -1619,7 +1619,7 @@ bool makeTextEntryMenu(const char *messagePtr, char *inputString, int stringMaxL
getMouseData(0, &mouseButton, &mouseX, &mouseY);
if (mouseButton & 2)
if ((mouseButton & 2) || g_cine->shouldQuit())
quit = 2;
else if (mouseButton & 1)
quit = 1;