diff options
| author | Einar Johan Trøan Sømåen | 2012-12-02 20:46:26 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-12-02 20:46:26 +0100 |
| commit | ea024cd2030f84f718346da4d9888a74f5315539 (patch) | |
| tree | de0aa2285684aac669d0c828d8ebb4c2be5297d5 /engines | |
| parent | 674c625209a8a3e684ae238a3af676110f6e5254 (diff) | |
| download | scummvm-rg350-ea024cd2030f84f718346da4d9888a74f5315539.tar.gz scummvm-rg350-ea024cd2030f84f718346da4d9888a74f5315539.tar.bz2 scummvm-rg350-ea024cd2030f84f718346da4d9888a74f5315539.zip | |
WINTERMUTE: Avoid including script_ext_math.h in base_game.cpp
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/wintermute/base/base_game.cpp | 3 | ||||
| -rw-r--r-- | engines/wintermute/base/base_game.h | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_engine.cpp | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp index b6886b7a33..7bdcbedb52 100644 --- a/engines/wintermute/base/base_game.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -54,7 +54,6 @@ #include "engines/wintermute/base/scriptables/script_engine.h" #include "engines/wintermute/base/scriptables/script_stack.h" #include "engines/wintermute/base/scriptables/script.h" -#include "engines/wintermute/base/scriptables/script_ext_math.h" #include "engines/wintermute/video/video_player.h" #include "engines/wintermute/video/video_theora_player.h" #include "engines/wintermute/utils/utils.h" @@ -405,7 +404,7 @@ bool BaseGame::initialize1() { break; } - _mathClass = new SXMath(this); + _mathClass = makeSXMath(this); if (_mathClass == NULL) { break; } diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h index 0f764b3d03..d941f9fa6a 100644 --- a/engines/wintermute/base/base_game.h +++ b/engines/wintermute/base/base_game.h @@ -138,7 +138,7 @@ public: BaseRenderer *_renderer; BaseSoundMgr *_soundMgr; ScEngine *_scEngine; - SXMath *_mathClass; + BaseScriptable *_mathClass; BaseSurfaceStorage *_surfaceStorage; BaseFontStorage *_fontStorage; BaseGame(const Common::String &gameId); diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index 3d1863946e..e8be0f0bd5 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -30,7 +30,6 @@ #include "engines/wintermute/base/scriptables/script_value.h" #include "engines/wintermute/base/scriptables/script.h" #include "engines/wintermute/base/scriptables/script_stack.h" -#include "engines/wintermute/base/scriptables/script_ext_math.h" #include "engines/wintermute/base/base_engine.h" #include "engines/wintermute/base/base_game.h" #include "engines/wintermute/base/base_file_manager.h" |