9 files changed, 20 insertions, 20 deletions
diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp
index 75219ef25f..e8f0ea5ad6 100644
--- a/engines/sword25/fmv/movieplayer.cpp
+++ b/engines/sword25/fmv/movieplayer.cpp
@@ -46,14 +46,14 @@ namespace Sword25 {
 #define FLT_EPSILON     1.192092896e-07F        /* smallest such that 1.0+FLT_EPSILON != 1.0 */
 
 Service *OggTheora_CreateObject(Kernel *pKernel) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	return new MoviePlayer(pKernel);
 #else
 	return NULL;
 #endif
 }
 
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 MoviePlayer::MoviePlayer(Kernel *pKernel) : Service(pKernel), _decoder(g_system->getMixer()) {
 	if (!registerScriptBindings())
 		BS_LOG_ERRORLN("Script bindings could not be registered.");
diff --git a/engines/sword25/fmv/movieplayer.h b/engines/sword25/fmv/movieplayer.h
index 083a364865..d8c5069f9e 100644
--- a/engines/sword25/fmv/movieplayer.h
+++ b/engines/sword25/fmv/movieplayer.h
@@ -40,7 +40,7 @@
 #include "sword25/fmv/theora_decoder.h"
 #include "sword25/gfx/bitmap.h"
 
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 
 namespace Sword25 {
 
diff --git a/engines/sword25/fmv/movieplayer_script.cpp b/engines/sword25/fmv/movieplayer_script.cpp
index 032159762a..eb352e19f5 100644
--- a/engines/sword25/fmv/movieplayer_script.cpp
+++ b/engines/sword25/fmv/movieplayer_script.cpp
@@ -42,7 +42,7 @@
 namespace Sword25 {
 
 int loadMovie(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
@@ -55,7 +55,7 @@ int loadMovie(lua_State *L) {
 }
 
 int unloadMovie(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
@@ -68,7 +68,7 @@ int unloadMovie(lua_State *L) {
 }
 
 int play(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
@@ -81,7 +81,7 @@ int play(lua_State *L) {
 }
 
 int pause(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
@@ -94,7 +94,7 @@ int pause(lua_State *L) {
 }
 
 int update(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
@@ -105,7 +105,7 @@ int update(lua_State *L) {
 }
 
 int isMovieLoaded(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
@@ -118,7 +118,7 @@ int isMovieLoaded(lua_State *L) {
 }
 
 int isPaused(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
@@ -131,7 +131,7 @@ int isPaused(lua_State *L) {
 }
 
 int getScaleFactor(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
@@ -144,7 +144,7 @@ int getScaleFactor(lua_State *L) {
 }
 
 int setScaleFactor(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
@@ -155,7 +155,7 @@ int setScaleFactor(lua_State *L) {
 }
 
 int getTime(lua_State *L) {
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	MoviePlayer *FMVPtr = Kernel::GetInstance()->GetFMV();
 	BS_ASSERT(FMVPtr);
 
@@ -183,7 +183,7 @@ const luaL_reg LIBRARY_FUNCTIONS[] = {
 	{ 0, 0 }
 };
 
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 bool MoviePlayer::registerScriptBindings() {
 	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp
index 66cd70bfee..c5c29a8160 100644
--- a/engines/sword25/fmv/theora_decoder.cpp
+++ b/engines/sword25/fmv/theora_decoder.cpp
@@ -38,7 +38,7 @@
 
 #include "sword25/fmv/theora_decoder.h"
 
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 #include "sword25/fmv/yuvtorgba.h"
 #include "common/system.h"
 #include "sound/decoders/raw.h"
diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h
index 7e59df52cc..13765e2ede 100644
--- a/engines/sword25/fmv/theora_decoder.h
+++ b/engines/sword25/fmv/theora_decoder.h
@@ -26,7 +26,7 @@
 #ifndef SWORD25_THEORADECODER_H
 #define SWORD25_THEORADECODER_H
 
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 
 #include "graphics/video/video_decoder.h"
 #include "sound/audiostream.h"
diff --git a/engines/sword25/fmv/yuvtorgba.cpp b/engines/sword25/fmv/yuvtorgba.cpp
index b17de73b27..e9d0189265 100644
--- a/engines/sword25/fmv/yuvtorgba.cpp
+++ b/engines/sword25/fmv/yuvtorgba.cpp
@@ -34,7 +34,7 @@
 
 #include "sword25/fmv/yuvtorgba.h"
 
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 
 namespace Sword25 {
 
diff --git a/engines/sword25/fmv/yuvtorgba.h b/engines/sword25/fmv/yuvtorgba.h
index bef00f56a3..f4973a6fbc 100644
--- a/engines/sword25/fmv/yuvtorgba.h
+++ b/engines/sword25/fmv/yuvtorgba.h
@@ -37,7 +37,7 @@
 
 #include "sword25/kernel/common.h"
 
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 #include <theora/theora.h>
 #include <theora/codec.h>
 
diff --git a/engines/sword25/kernel/kernel.cpp b/engines/sword25/kernel/kernel.cpp
index a05d6b1610..d976a36ab5 100644
--- a/engines/sword25/kernel/kernel.cpp
+++ b/engines/sword25/kernel/kernel.cpp
@@ -430,7 +430,7 @@ ScriptEngine *Kernel::GetScript() {
 
 // -----------------------------------------------------------------------------
 
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 /**
  * Returns a pointer to the movie player, or NULL if it is not active
  */
diff --git a/engines/sword25/kernel/kernel.h b/engines/sword25/kernel/kernel.h
index 0b5cfa3b02..a06a59311b 100644
--- a/engines/sword25/kernel/kernel.h
+++ b/engines/sword25/kernel/kernel.h
@@ -201,7 +201,7 @@ public:
 	 */
 	ScriptEngine *GetScript();
 
-#ifdef ENABLE_THEORADEC
+#ifdef USE_THEORADEC
 	/**
 	 * Returns a pointer to the movie player, or NULL if it is not active
 	 */