diff options
| author | Filippos Karapetis | 2016-08-22 13:06:20 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2016-08-22 13:06:20 +0300 |
| commit | f629a328199708de7c35eba32eb17b6f69586df4 (patch) | |
| tree | fdc8bf39fa1e4a6cd7e389ee3d48281acb45301d /engines/wintermute/base/scriptables | |
| parent | f47ab0000f503b2d4fa138550cb6bd636aa7a3db (diff) | |
| download | scummvm-rg350-f629a328199708de7c35eba32eb17b6f69586df4.tar.gz scummvm-rg350-f629a328199708de7c35eba32eb17b6f69586df4.tar.bz2 scummvm-rg350-f629a328199708de7c35eba32eb17b6f69586df4.zip | |
WINTERMUTE: Fix compilation with MSVC
Change the way that EXTENDED_DEBUGGER_ENABLED is checked. The way it
was used, it triggered a fatal error C1017
Diffstat (limited to 'engines/wintermute/base/scriptables')
| -rw-r--r-- | engines/wintermute/base/scriptables/script.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_engine.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp index 938ec031da..c13310255d 100644 --- a/engines/wintermute/base/scriptables/script.cpp +++ b/engines/wintermute/base/scriptables/script.cpp @@ -32,7 +32,7 @@ #include "engines/wintermute/base/scriptables/script_engine.h" #include "engines/wintermute/base/scriptables/script_stack.h" #include "common/memstream.h" -#if EXTENDED_DEBUGGER_ENABLED == true +#if EXTENDED_DEBUGGER_ENABLED #include "engines/wintermute/base/scriptables/debuggable/debuggable_script.h" #endif namespace Wintermute { @@ -1320,7 +1320,7 @@ ScScript *ScScript::invokeEventHandler(const Common::String &eventName, bool unb if (!pos) { return nullptr; } -#if EXTENDED_DEBUGGER_ENABLED == true +#if EXTENDED_DEBUGGER_ENABLED // TODO: Not pretty DebuggableScEngine* debuggableEngine; debuggableEngine = dynamic_cast<DebuggableScEngine*>(_engine); diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index 26122094f1..8d957c6951 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -144,7 +144,7 @@ ScScript *ScEngine::runScript(const char *filename, BaseScriptHolder *owner) { } // add new script -#if EXTENDED_DEBUGGER_ENABLED == true +#if EXTENDED_DEBUGGER_ENABLED DebuggableScEngine* debuggableEngine; debuggableEngine = dynamic_cast<DebuggableScEngine*>(this); // TODO: Not pretty |