diff options
Diffstat (limited to 'engines/wintermute')
-rw-r--r-- | engines/wintermute/base/base_game.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_game.h | 4 | ||||
-rw-r--r-- | engines/wintermute/base/base_script_holder.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_engine.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/debugger.h | 6 |
6 files changed, 11 insertions, 11 deletions
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp index ce4c5fdda5..1af7e2b56d 100644 --- a/engines/wintermute/base/base_game.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -71,7 +71,7 @@ #include "common/system.h" #include "common/file.h" -#if EXTENDED_DEBUGGER_ENABLED == true +#if EXTENDED_DEBUGGER_ENABLED #include "engines/wintermute/base/scriptables/debuggable/debuggable_script_engine.h" #endif @@ -402,7 +402,7 @@ bool BaseGame::initialize1() { break; } -#if EXTENDED_DEBUGGER_ENABLED == true +#if EXTENDED_DEBUGGER_ENABLED _scEngine = new DebuggableScEngine(this); #else _scEngine = new ScEngine(this); diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h index 409cc20ba4..6aacc1feab 100644 --- a/engines/wintermute/base/base_game.h +++ b/engines/wintermute/base/base_game.h @@ -36,7 +36,7 @@ #include "engines/wintermute/math/rect32.h" #include "engines/wintermute/debugger.h" #include "common/events.h" -#if EXTENDED_DEBUGGER_ENABLED == true +#if EXTENDED_DEBUGGER_ENABLED #include "engines/wintermute/base/scriptables/debuggable/debuggable_script_engine.h" #endif @@ -152,7 +152,7 @@ public: BaseRenderer *_renderer; BaseSoundMgr *_soundMgr; -#if EXTENDED_DEBUGGER_ENABLED == true +#if EXTENDED_DEBUGGER_ENABLED DebuggableScEngine *_scEngine; #else ScEngine *_scEngine; diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp index 7427a9b082..fd9dd6a2a5 100644 --- a/engines/wintermute/base/base_script_holder.cpp +++ b/engines/wintermute/base/base_script_holder.cpp @@ -466,7 +466,7 @@ void BaseScriptHolder::makeFreezable(bool freezable) { ScScript *BaseScriptHolder::invokeMethodThread(const char *methodName) { for (int i = _scripts.size() - 1; i >= 0; i--) { if (_scripts[i]->canHandleMethod(methodName)) { -#if EXTENDED_DEBUGGER_ENABLED == true +#if EXTENDED_DEBUGGER_ENABLED DebuggableScEngine* debuggableEngine; debuggableEngine = dynamic_cast<DebuggableScEngine*>(_scripts[i]->_engine); // TODO: Not pretty 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 diff --git a/engines/wintermute/debugger.h b/engines/wintermute/debugger.h index e5008bee3b..6b1d2312ba 100644 --- a/engines/wintermute/debugger.h +++ b/engines/wintermute/debugger.h @@ -23,11 +23,11 @@ #ifndef WINTERMUTE_DEBUGGER_H #define WINTERMUTE_DEBUGGER_H -#define EXTENDED_DEBUGGER_ENABLED true +#define EXTENDED_DEBUGGER_ENABLED 1 #include "gui/debugger.h" -#if EXTENDED_DEBUGGER_ENABLED == true +#if EXTENDED_DEBUGGER_ENABLED #include "engines/wintermute/base/scriptables/debuggable/debuggable_script.h" #else #include "engines/wintermute/base/scriptables/script.h" @@ -71,7 +71,7 @@ public: bool Cmd_ShowFps(int argc, const char **argv); bool Cmd_DumpFile(int argc, const char **argv); -#if EXTENDED_DEBUGGER_ENABLED == true +#if EXTENDED_DEBUGGER_ENABLED /** * Step - break again on next line */ |