Removes ENABLE_KYRA2 and ENABLE_KYRA3.

svn-id: r22492

5 files changed, 2 insertions, 21 deletions

diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h
index 5dd689f516..71a68a712e 100644
--- a/engines/kyra/kyra.h
+++ b/engines/kyra/kyra.h
@@ -1009,8 +1009,7 @@ public:
 	int go();
 };
 
-#ifdef ENABLE_KYRA3
-// maybe overload KyraEngine_v2 later
+// maybe subclass KyraEngine_v2 later
 class KyraEngine_v3 : public KyraEngine {
 public:
 	KyraEngine_v3(OSystem *system);
@@ -1022,7 +1021,6 @@ public:
 	
 	int go();
 };
-#endif
 
 } // End of namespace Kyra
 
diff --git a/engines/kyra/kyra3.cpp b/engines/kyra/kyra3.cpp
index f1db8eaf10..8fd45d9137 100644
--- a/engines/kyra/kyra3.cpp
+++ b/engines/kyra/kyra3.cpp
@@ -20,7 +20,6 @@
  *
  */
 
-#ifdef ENABLE_KYRA3
 #include "kyra/kyra.h"
 #include "kyra/screen.h"
 #include "kyra/wsamovie.h"
@@ -77,4 +76,3 @@ int KyraEngine_v3::go() {
 	return 0;
 }
 }
-#endif // ENABLE_KYRA3
diff --git a/engines/kyra/plugin.cpp b/engines/kyra/plugin.cpp
index 4d35f6ced0..0450b6ac91 100644
--- a/engines/kyra/plugin.cpp
+++ b/engines/kyra/plugin.cpp
@@ -32,8 +32,6 @@
 
 using namespace Kyra;
 
-#undef ENABLE_KYRA2
-
 enum {
 	// We only compute MD5 of the first megabyte of our data files.
 	kMD5FileSizeLimit = 1024 * 1024
@@ -87,30 +85,22 @@ const GameSettings kyra1_games[] = {
 };
 
 const GameSettings kyra2_games[] = {
-#ifdef ENABLE_KYRA2
 	{ "kyra2", "The Hand of Fate",				GI_KYRA2, GF_ENGLISH,	// CD version? Floppy version?
 										"28cbad1c5bf06b2d3825ae57d760d032", "FATE.PAK" },
-#endif
 	{ 0, 0, 0, 0, 0, 0 }
 };
 
 const GameSettings kyra3_games[] = {
-#ifdef ENABLE_KYRA3
 	{ "kyra3", "The Legend of Kyrandia: Book Three",
 	GI_KYRA3, GF_LNGUNK, "3833ff312757b8e6147f464cca0a6587", "ONETIME.PAK" },
-#endif
 	{ 0, 0, 0, 0, 0, 0 }
 };
 
 // Keep list of different supported games
 const PlainGameDescriptor kyra_list[] = {
 	{ "kyra1", "The Legend of Kyrandia" },
-#ifdef ENABLE_KYRA2
 	{ "kyra2", "The Hand of Fate" },
-#endif
-#ifdef ENABLE_KYRA3
 	{ "kyra3", "The Legend of Kyrandia: Book Three" },
-#endif
 	{ 0, 0 }
 };
 
@@ -276,10 +266,8 @@ PluginError Engine_KYRA_create(OSystem *syst, Engine **engine) {
 		*engine = new KyraEngine_v1(syst);
 	} else if (!scumm_stricmp("kyra2", gameid)) {
 		*engine = new KyraEngine_v2(syst);
-#ifdef ENABLE_KYRA3
 	} else if (!scumm_stricmp("kyra3", gameid)) {
 		*engine = new KyraEngine_v3(syst);
-#endif
 	} else
 		error("Kyra engine created with invalid gameid.");
 	
diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp
index 85cb0c3a33..165da86a6d 100644
--- a/engines/kyra/wsamovie.cpp
+++ b/engines/kyra/wsamovie.cpp
@@ -207,7 +207,6 @@ void WSAMovieV1::processFrame(int frameNum, uint8 *dst) {
 
 #pragma mark -
 
-#ifdef ENABLE_KYRA3
 WSAMovieV3::WSAMovieV3(KyraEngine_v3 *vm) : WSAMovieV1(vm), _vm3(vm), _xAdd(0), _yAdd(0) {}
 
 void WSAMovieV3::open(const char *filename, int unk1, uint8 *palBuf) {
@@ -282,6 +281,5 @@ void WSAMovieV3::open(const char *filename, int unk1, uint8 *palBuf) {
 	delete [] p;
 	_opened = true;
 }
-#endif
 
 } // end of namespace Kyra
diff --git a/engines/kyra/wsamovie.h b/engines/kyra/wsamovie.h
index 00fe4ef4f3..a6319bba99 100644
--- a/engines/kyra/wsamovie.h
+++ b/engines/kyra/wsamovie.h
@@ -85,9 +85,9 @@ protected:
 	uint8 *_frameData;
 };
 
-#ifdef ENABLE_KYRA3
 class KyraEngine_v3;
 
+// it could be possible that Kyrandia2 uses exactly the same format
 class WSAMovieV3 : public WSAMovieV1 {
 public:
 	WSAMovieV3(KyraEngine_v3 *vm);
@@ -102,7 +102,6 @@ protected:
 	int16 _xAdd;
 	int16 _yAdd;
 };
-#endif
 
 } // end of namespace Kyra