XEEN: Merge Clouds and DarkSide engines into WorldOfXeenEngine

scummvm · Nov 18, 2015 · 619a165 · 619a165
1 parent 569f3c6
commit 619a165
Show file tree

Hide file tree

Showing 8 changed files with 208 additions and 371 deletions.
diff --git a/engines/xeen/clouds/clouds_game.cpp b/engines/xeen/clouds/clouds_game.cpp
diff --git a/engines/xeen/clouds/clouds_game.h b/engines/xeen/clouds/clouds_game.h
diff --git a/engines/xeen/darkside/darkside_game.cpp b/engines/xeen/darkside/darkside_game.cpp
diff --git a/engines/xeen/darkside/darkside_game.h b/engines/xeen/darkside/darkside_game.h
diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp
@@ -21,8 +21,6 @@
  */
 
 #include "xeen/xeen.h"
-#include "xeen/clouds/clouds_game.h"
-#include "xeen/darkside/darkside_game.h"
 #include "xeen/worldofxeen/worldofxeen_game.h"
 
 #include "base/plugins.h"
@@ -116,11 +114,7 @@ bool XeenMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
 
 	switch (gd->gameID) {
 	case Xeen::GType_Clouds:
-		*engine = new Xeen::CloudsEngine(syst, gd);
-		break;
 	case Xeen::GType_DarkSide:
-		*engine = new Xeen::DarkSideEngine(syst, gd);
-		break;
 	case Xeen::GType_WorldOfXeen:
 		*engine = new Xeen::WorldOfXeenEngine(syst, gd);
 		break;

diff --git a/engines/xeen/module.mk b/engines/xeen/module.mk
@@ -1,8 +1,6 @@
 MODULE := engines/xeen
 
 MODULE_OBJS := \
-	clouds/clouds_game.o \
-	darkside/darkside_game.o \
 	worldofxeen/worldofxeen_game.o \
 	character.o \
 	combat.o \