aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/input.cpp
diff options
context:
space:
mode:
authorJordi Vilalta Prat2008-05-06 03:00:26 +0000
committerJordi Vilalta Prat2008-05-06 03:00:26 +0000
commit38a8aa516e0fa315e318801e5399f82e51efa8df (patch)
treec6f7bc89fe2340a846ef891cefc9031cfdb32ec9 /engines/scumm/input.cpp
parent3ac46924e311afb6b02615af04556da823c4f3f3 (diff)
downloadscummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.tar.gz
scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.tar.bz2
scummvm-rg350-38a8aa516e0fa315e318801e5399f82e51efa8df.zip
Allow static and dynamic plugins to be used at the same time
svn-id: r31888
Diffstat (limited to 'engines/scumm/input.cpp')
-rw-r--r--engines/scumm/input.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index b53867ca3d..35028c7e1c 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -36,7 +36,7 @@
#include "scumm/dialogs.h"
#include "scumm/insane/insane.h"
#include "scumm/imuse/imuse.h"
-#ifndef DISABLE_HE
+#ifdef ENABLE_HE
#include "scumm/he/intern_he.h"
#include "scumm/he/logic_he.h"
#endif
@@ -202,7 +202,7 @@ void ScummEngine::parseEvents() {
}
}
-#ifndef DISABLE_HE
+#ifdef ENABLE_HE
void ScummEngine_v90he::clearClickedStatus() {
ScummEngine::clearClickedStatus();
if (_game.heversion >= 98) {
@@ -328,7 +328,7 @@ void ScummEngine::processInput() {
processKeyboard(lastKeyHit);
}
-#ifndef DISABLE_SCUMM_7_8
+#ifdef ENABLE_SCUMM_7_8
void ScummEngine_v8::processKeyboard(Common::KeyState lastKeyHit) {
if (!(_game.features & GF_DEMO)) {