aboutsummaryrefslogtreecommitdiff
path: root/scumm/vars.cpp
diff options
context:
space:
mode:
authorMax Horn2004-01-09 13:14:59 +0000
committerMax Horn2004-01-09 13:14:59 +0000
commitee53fb439171c4e2f9c2c76d6c654bd781207921 (patch)
treea059b0fde19a24bdd248becf848ab9152538be4d /scumm/vars.cpp
parent638231cc59c964106de917a376de9ffb6b7d6784 (diff)
downloadscummvm-rg350-ee53fb439171c4e2f9c2c76d6c654bd781207921.tar.gz
scummvm-rg350-ee53fb439171c4e2f9c2c76d6c654bd781207921.tar.bz2
scummvm-rg350-ee53fb439171c4e2f9c2c76d6c654bd781207921.zip
Fix for bug #873688
svn-id: r12274
Diffstat (limited to 'scumm/vars.cpp')
-rw-r--r--scumm/vars.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index 08e4452ada..97e9233cac 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -37,7 +37,6 @@ void ScummEngine::setupScummVars() {
VAR_MACHINE_SPEED = 6;
VAR_ME = 7;
VAR_NUM_ACTOR = 8;
- VAR_CURRENT_LIGHTS = 9;
VAR_CURRENTDRIVE = 10;
VAR_TMR_1 = 11;
VAR_TMR_2 = 12;
@@ -138,8 +137,15 @@ void ScummEngine_v2::setupScummVars() {
VAR_TALK_ACTOR = 41;
}
+void ScummEngine_v5::setupScummVars() {
+ // Many vars are the same as in V5 & V6 games, so just call the inherited method first
+ ScummEngine::setupScummVars();
+
+ VAR_CURRENT_LIGHTS = 9;
+}
+
void ScummEngine_v6::setupScummVars() {
- // Many vars are the same as in V5 games, so just call the inherited method first
+ // Many vars are the same as in V5 & V6 games, so just call the inherited method first
ScummEngine::setupScummVars();
VAR_V6_SCREEN_WIDTH = 41;