aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/script.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/agos/script.cpp')
-rw-r--r--engines/agos/script.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp
index 39c172be62..4bcb573e09 100644
--- a/engines/agos/script.cpp
+++ b/engines/agos/script.cpp
@@ -965,7 +965,7 @@ void AGOSEngine::writeVariable(uint16 variable, uint16 contents) {
int AGOSEngine::runScript() {
bool flag;
- if (quit())
+ if (shouldQuit())
return 1;
do {
@@ -1010,9 +1010,9 @@ int AGOSEngine::runScript() {
error("Invalid opcode '%d' encountered", _opcode);
executeOpcode(_opcode);
- } while (getScriptCondition() != flag && !getScriptReturn() && !quit());
+ } while (getScriptCondition() != flag && !getScriptReturn() && !shouldQuit());
- return (quit()) ? 1 : getScriptReturn();
+ return (shouldQuit()) ? 1 : getScriptReturn();
}
Child *nextSub(Child *sub, int16 key) {
@@ -1066,7 +1066,7 @@ void AGOSEngine::waitForSync(uint a) {
_exitCutscene = false;
_rightButtonDown = false;
- while (_vgaWaitFor != 0 && !quit()) {
+ while (_vgaWaitFor != 0 && !shouldQuit()) {
if (_rightButtonDown) {
if (_vgaWaitFor == 200 && (getGameType() == GType_FF || !getBitFlag(14))) {
skipSpeech();