diff options
| author | Eugene Sandulenko | 2010-10-19 20:52:06 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-19 20:52:06 +0000 |
| commit | bbd95da899c496c10a4050b7b3cfd3f8dc8aa6b3 (patch) | |
| tree | 53122d619c22e501328dd0cd034a08c3605a6ab3 /engines/sword25/kernel | |
| parent | d94435eebd8ab8e21a4a28a0274cae02910cb41d (diff) | |
| download | scummvm-rg350-bbd95da899c496c10a4050b7b3cfd3f8dc8aa6b3.tar.gz scummvm-rg350-bbd95da899c496c10a4050b7b3cfd3f8dc8aa6b3.tar.bz2 scummvm-rg350-bbd95da899c496c10a4050b7b3cfd3f8dc8aa6b3.zip | |
SWORD25: Fix engine exit when running without theoradec
svn-id: r53622
Diffstat (limited to 'engines/sword25/kernel')
| -rw-r--r-- | engines/sword25/kernel/kernel.cpp | 4 | ||||
| -rw-r--r-- | engines/sword25/kernel/kernel.h | 2 | ||||
| -rw-r--r-- | engines/sword25/kernel/service_ids.h | 4 |
3 files changed, 0 insertions, 10 deletions
diff --git a/engines/sword25/kernel/kernel.cpp b/engines/sword25/kernel/kernel.cpp index ba554fe043..3c3505a6b2 100644 --- a/engines/sword25/kernel/kernel.cpp +++ b/engines/sword25/kernel/kernel.cpp @@ -34,9 +34,7 @@ #include "common/system.h" #include "sword25/gfx/graphicengine.h" -#ifdef USE_THEORADEC #include "sword25/fmv/movieplayer.h" -#endif #include "sword25/input/inputengine.h" #include "sword25/kernel/kernel.h" #include "sword25/kernel/persistenceservice.h" @@ -439,14 +437,12 @@ ScriptEngine *Kernel::GetScript() { // ----------------------------------------------------------------------------- -#ifdef USE_THEORADEC /** * Returns a pointer to the movie player, or NULL if it is not active. */ MoviePlayer *Kernel::GetFMV() { return static_cast<MoviePlayer *>(GetService("fmv")); } -#endif // ----------------------------------------------------------------------------- diff --git a/engines/sword25/kernel/kernel.h b/engines/sword25/kernel/kernel.h index b36e24d05e..9876830053 100644 --- a/engines/sword25/kernel/kernel.h +++ b/engines/sword25/kernel/kernel.h @@ -201,12 +201,10 @@ public: */ ScriptEngine *GetScript(); -#ifdef USE_THEORADEC /** * Returns a pointer to the movie player, or NULL if it is not active */ MoviePlayer *GetFMV(); -#endif /** * Pauses for the specified amount of time diff --git a/engines/sword25/kernel/service_ids.h b/engines/sword25/kernel/service_ids.h index 36bc6e2803..2552d279cc 100644 --- a/engines/sword25/kernel/service_ids.h +++ b/engines/sword25/kernel/service_ids.h @@ -55,11 +55,7 @@ Service *InputEngine_CreateObject(Kernel *pKernel); Service *SoundEngine_CreateObject(Kernel *pKernel); Service *LuaScriptEngine_CreateObject(Kernel *pKernel); Service *Geometry_CreateObject(Kernel *pKernel); -#ifdef USE_THEORADEC Service *OggTheora_CreateObject(Kernel *pKernel); -#else -Service *OggTheora_CreateObject(Kernel *pKernel) { return NULL; } -#endif /** |