aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2004-07-22 04:28:31 +0000
committerTravis Howell2004-07-22 04:28:31 +0000
commite133de4d515033defc056375f0a93a6a33cae549 (patch)
tree641dc20c3fa6d5f8aff3a9a1142541298ee7913a
parentf09313d6a9ed8ddac1c6fc4d4f207837a925bf86 (diff)
downloadscummvm-rg350-e133de4d515033defc056375f0a93a6a33cae549.tar.gz
scummvm-rg350-e133de4d515033defc056375f0a93a6a33cae549.tar.bz2
scummvm-rg350-e133de4d515033defc056375f0a93a6a33cae549.zip
VAR not used in scumm3.
svn-id: r14297
-rw-r--r--scumm/scumm.cpp2
-rw-r--r--scumm/vars.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 45a3001d8a..35c28780c8 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1284,7 +1284,7 @@ void ScummEngine::initScummVars() {
return;
}
- if (_version < 6)
+ if (_version >= 4 && _version <= 6)
VAR(VAR_V5_TALK_STRING_Y) = -0x50;
if (_version == 8) { // Fixme: How do we deal with non-cd installs?
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index 769af21b2e..3c09042909 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -73,6 +73,7 @@ void ScummEngine::setupScummVars() {
VAR_TMR_4 = 47;
VAR_SOUNDCARD = 48;
VAR_VIDEOMODE = 49;
+
if (_version >= 4) {
VAR_SCROLL_SCRIPT = 27;
VAR_DEBUGMODE = 39;
@@ -141,7 +142,9 @@ void ScummEngine_v5::setupScummVars() {
ScummEngine::setupScummVars();
VAR_CURRENT_LIGHTS = 9;
- VAR_V5_TALK_STRING_Y = 54;
+
+ if (_version >= 4)
+ VAR_V5_TALK_STRING_Y = 54;
}
void ScummEngine_v6::setupScummVars() {