aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/script.cpp
diff options
context:
space:
mode:
authorTravis Howell2006-03-15 05:59:30 +0000
committerTravis Howell2006-03-15 05:59:30 +0000
commitcc8796248da47d9bb964efddabaca0491ace5122 (patch)
tree328dc15b6961cc12ddbb900e09315577d86cabd7 /engines/scumm/script.cpp
parent1f603fdd98959f189f10073bff1d8f83f72eac6b (diff)
downloadscummvm-rg350-cc8796248da47d9bb964efddabaca0491ace5122.tar.gz
scummvm-rg350-cc8796248da47d9bb964efddabaca0491ace5122.tar.bz2
scummvm-rg350-cc8796248da47d9bb964efddabaca0491ace5122.zip
Minor cleanup
svn-id: r21306
Diffstat (limited to 'engines/scumm/script.cpp')
-rw-r--r--engines/scumm/script.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index d50b1120b4..dc91d624cc 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -923,7 +923,7 @@ void ScummEngine::runAllScripts() {
}
void ScummEngine::runExitScript() {
- if (_game.version > 2 && VAR(VAR_EXIT_SCRIPT))
+ if (VAR_EXIT_SCRIPT != 0xFF && VAR(VAR_EXIT_SCRIPT))
runScript(VAR(VAR_EXIT_SCRIPT), 0, 0, 0);
if (_EXCD_offs) {
int slot = getScriptSlot();
@@ -952,12 +952,12 @@ void ScummEngine::runExitScript() {
initializeLocals(slot, 0);
runScriptNested(slot);
}
- if (_game.version > 2 && VAR(VAR_EXIT_SCRIPT2))
+ if (VAR_EXIT_SCRIPT2 != 0xFF && VAR(VAR_EXIT_SCRIPT2))
runScript(VAR(VAR_EXIT_SCRIPT2), 0, 0, 0);
}
void ScummEngine::runEntryScript() {
- if (_game.version > 2 && VAR(VAR_ENTRY_SCRIPT))
+ if (VAR_ENTRY_SCRIPT != 0xFF && VAR(VAR_ENTRY_SCRIPT))
runScript(VAR(VAR_ENTRY_SCRIPT), 0, 0, 0);
if (_ENCD_offs) {
int slot = getScriptSlot();
@@ -973,7 +973,7 @@ void ScummEngine::runEntryScript() {
initializeLocals(slot, 0);
runScriptNested(slot);
}
- if (_game.version > 2 && VAR(VAR_ENTRY_SCRIPT2))
+ if (VAR_ENTRY_SCRIPT2 != 0xFF && VAR(VAR_ENTRY_SCRIPT2))
runScript(VAR(VAR_ENTRY_SCRIPT2), 0, 0, 0);
}