aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-02-25 10:48:35 +0000
committerTravis Howell2004-02-25 10:48:35 +0000
commit793bc427de9361db7a9eb840be8631da2fe69cf7 (patch)
tree7b964465a0b4cdf758712f10c48664ea8bbf7dd5
parent5df1bd8b492593cd89c6b9c65f2a49e421d23953 (diff)
downloadscummvm-rg350-793bc427de9361db7a9eb840be8631da2fe69cf7.tar.gz
scummvm-rg350-793bc427de9361db7a9eb840be8631da2fe69cf7.tar.bz2
scummvm-rg350-793bc427de9361db7a9eb840be8631da2fe69cf7.zip
Fix VAR_VOICE_MODE in COMI
svn-id: r13051
-rw-r--r--scumm/script_v8.cpp4
-rw-r--r--scumm/scummvm.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 40db14ace4..6096b64cc3 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1483,7 +1483,9 @@ void ScummEngine_v8::o8_kernelGetFunctions() {
// scripts. Probably a wrong push/pop somewhere. For now override to correct value.
array = 658;
ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array));
- if (!strcmp((char *)ah->data, "Saveload Page") || !strcmp((char *)ah->data, "Object Names"))
+ if (!strcmp((char *)ah->data, "Text Status"))
+ push(ConfMan.getBool("subtitles"));
+ else if (!strcmp((char *)ah->data, "Saveload Page") || !strcmp((char *)ah->data, "Object Names"))
push(1);
else
push(0);
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index a66c7a8c1d..0e839611ce 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1204,7 +1204,7 @@ void ScummEngine::initScummVars() {
if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
_scummVars[74] = 1225;
- if (_version >= 7)
+ if (_version == 7)
VAR(VAR_VOICE_MODE) = ConfMan.getBool("subtitles");
VAR(VAR_CHARINC) = 4;