From 681ec592927b8d9a81eed7b1038743bf8e378de2 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Wed, 13 Oct 2010 13:07:16 +0000 Subject: SWORD25: Added a ENABLE_THEORA define inside fmv/theora_decoder.h This define can be used to disable building of the Theora decoder, and thus makes libtheora optional (therefore resolving an item in the Sword25 TODO). Disabling the Theora decoder will effectively disable the game's videos Note that running the game with the Theora decoder disabled is still untested svn-id: r53416 --- engines/sword25/kernel/kernel.cpp | 2 ++ engines/sword25/kernel/kernel.h | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'engines/sword25/kernel') diff --git a/engines/sword25/kernel/kernel.cpp b/engines/sword25/kernel/kernel.cpp index cccfc6ea53..cbe71edcbb 100644 --- a/engines/sword25/kernel/kernel.cpp +++ b/engines/sword25/kernel/kernel.cpp @@ -430,12 +430,14 @@ ScriptEngine *Kernel::GetScript() { // ----------------------------------------------------------------------------- +#ifdef ENABLE_THEORA /** * Returns a pointer to the movie player, or NULL if it is not active */ MoviePlayer *Kernel::GetFMV() { return static_cast(GetService("fmv")); } +#endif // ----------------------------------------------------------------------------- diff --git a/engines/sword25/kernel/kernel.h b/engines/sword25/kernel/kernel.h index 29cf1b550c..0962957d10 100644 --- a/engines/sword25/kernel/kernel.h +++ b/engines/sword25/kernel/kernel.h @@ -55,6 +55,7 @@ #include "sword25/kernel/common.h" #include "sword25/kernel/window.h" #include "sword25/kernel/resmanager.h" +#include "sword25/fmv/theora_decoder.h" // for ENABLE_THEORA namespace Sword25 { @@ -200,10 +201,13 @@ public: * Returns a pointer to the script engine, or NULL if it is not active */ ScriptEngine *GetScript(); + +#ifdef ENABLE_THEORA /** * Returns a pointer to the movie player, or NULL if it is not active */ MoviePlayer *GetFMV(); +#endif /** * Pauses for the specified amount of time -- cgit v1.2.3