aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/vars.cpp
diff options
context:
space:
mode:
authorTravis Howell2007-12-27 11:40:29 +0000
committerTravis Howell2007-12-27 11:40:29 +0000
commit410a4a974ef78324ba6d8bd5535b2b46b231b0f7 (patch)
tree0d51afe35658e4b7d880d8a495a2760b958b43ff /engines/scumm/vars.cpp
parent1bafd03a698130c21c222edb0bc011fc39a6e003 (diff)
downloadscummvm-rg350-410a4a974ef78324ba6d8bd5535b2b46b231b0f7.tar.gz
scummvm-rg350-410a4a974ef78324ba6d8bd5535b2b46b231b0f7.tar.bz2
scummvm-rg350-410a4a974ef78324ba6d8bd5535b2b46b231b0f7.zip
Enable Windows version of early HE games by default, to match already enabled 3DO/DOS/Macintosh versions of early HE games. Adding only the minimum code required for HE70 games.
svn-id: r30011
Diffstat (limited to 'engines/scumm/vars.cpp')
-rw-r--r--engines/scumm/vars.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index a00da335d2..8917a80aea 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -27,9 +27,7 @@
#include "common/config-manager.h"
#include "scumm/scumm.h"
#include "scumm/intern.h"
-#ifndef DISABLE_HE
#include "scumm/he/intern_he.h"
-#endif
#include "scumm/he/logic_he.h"
#include "sound/mididrv.h"
@@ -207,7 +205,6 @@ void ScummEngine_v6::setupScummVars() {
}
}
-#ifndef DISABLE_HE
void ScummEngine_v70he::setupScummVars() {
ScummEngine_v6::setupScummVars();
@@ -219,6 +216,7 @@ void ScummEngine_v70he::setupScummVars() {
VAR_SOUND_CHANNEL = 14;
}
+#ifndef DISABLE_HE
void ScummEngine_v72he::setupScummVars() {
VAR_KEYPRESS = 0;
VAR_DEBUGMODE = 1;
@@ -624,7 +622,6 @@ void ScummEngine_v8::resetScummVars() {
}
#endif
-#ifndef DISABLE_HE
void ScummEngine_v70he::resetScummVars() {
ScummEngine::resetScummVars();
@@ -636,6 +633,7 @@ void ScummEngine_v70he::resetScummVars() {
VAR(VAR_TALK_CHANNEL) = 2;
}
+#ifndef DISABLE_HE
void ScummEngine_v72he::resetScummVars() {
ScummEngine_v70he::resetScummVars();