ENGINES: ALL: Move detection_enums -> detection.h

- Cleans up headers quite a bit.

engines/access/access.h

@@ -50,7 +50,7 @@
 #include "access/scripts.h"
 #include "access/sound.h"
 #include "access/video.h"
-#include "access/detection_enums.h"
+#include "access/detection.h"
 
 /**
  * This is the namespace of the Access engine.
@@ -69,8 +69,6 @@ enum AccessDebugChannels {
 	kDebugSound     = 1 << 3
 };
 
-struct AccessGameDescription;
-
 extern const char *const _estTable[];
 
 #define ACCESS_SAVEGAME_VERSION 1

engines/access/detection.cpp

@@ -23,7 +23,6 @@
 #include "base/plugins.h"
 #include "engines/advancedDetector.h"
 #include "access/detection.h"
-#include "access/detection_enums.h"
 
 static const PlainGameDescriptor AccessGames[] = {
 	{"amazon", "Amazon: Guardians of Eden"},

engines/access/detection.h

@@ -23,8 +23,16 @@
 #ifndef ACCESS_DETECTION_H
 #define ACCESS_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Access {
 
+enum {
+	GType_Amazon = 1,
+	GType_MartianMemorandum = 2,
+	GType_Noctropolis = 3
+};
+
 struct AccessGameDescription {
 	ADGameDescription desc;
 

engines/access/detection_enums.h

@@ -1,36 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ACCESS_DETECTION_ENUMS_H
-#define ACCESS_DETECTION_ENUMS_H
-
-namespace Access {
-
-enum {
-	GType_Amazon = 1,
-	GType_MartianMemorandum = 2,
-	GType_Noctropolis = 3
-};
-
-} // End of namespace Access
-
-#endif // ACCESS_DETECTION_ENUMS_H

engines/adl/adl.h

@@ -41,7 +41,7 @@
 #include "adl/console.h"
 #include "adl/disk.h"
 #include "adl/sound.h"
-#include "adl/detection_enums.h"
+#include "adl/detection.h"
 
 namespace Common {
 class ReadStream;
@@ -62,7 +62,6 @@ Common::Platform getPlatform(const AdlGameDescription &desc);
 class Console;
 class Display;
 class GraphicsMan;
-struct AdlGameDescription;
 class ScriptEnv;
 
 enum kDebugChannels {

engines/adl/adl_v2.cpp

@@ -26,7 +26,7 @@
 #include "adl/adl_v2.h"
 #include "adl/display.h"
 #include "adl/graphics.h"
-#include "adl/detection_enums.h"
+#include "adl/detection.h"
 
 namespace Adl {
 

engines/adl/detection.cpp

@@ -27,7 +27,6 @@
 
 #include "engines/advancedDetector.h"
 
-#include "adl/detection_enums.h"
 #include "adl/detection.h"
 #include "adl/disk.h"
 #include "adl/disk_image_helpers.h"

engines/adl/detection.h

@@ -23,8 +23,47 @@
 #ifndef ADL_DETECTION_H
 #define ADL_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Adl {
 
+#define SAVEGAME_VERSION 0
+#define SAVEGAME_NAME_LEN 32
+
+enum GameType {
+	GAME_TYPE_NONE,
+	GAME_TYPE_HIRES0,
+	GAME_TYPE_HIRES1,
+	GAME_TYPE_HIRES2,
+	GAME_TYPE_HIRES3,
+	GAME_TYPE_HIRES4,
+	GAME_TYPE_HIRES5,
+	GAME_TYPE_HIRES6
+};
+
+/*
+ * ====== Mystery House supported versions ======
+ * GAME_VER_HR1_SIMI:
+ * - Instructions always shown (no prompt)
+ * - Instructions contain Simi Valley address
+ * - On-Line Systems title screen in main executable only and waits for key
+ * GAME_VER_HR1_COARSE:
+ * - Longer instructions, now containing Coarsegold address
+ * - On-Line Systems title screen with instructions prompt
+ * GAME_VER_HR1_PD:
+ * - Public Domain disclaimer on startup
+ * - Sierra On-Line title screen with instructions prompt
+ *
+ * Note: there are probably at least two or three more variants
+ */
+
+enum GameVersion {
+	GAME_VER_NONE = 0,
+	GAME_VER_HR1_SIMI = 0,
+	GAME_VER_HR1_COARSE,
+	GAME_VER_HR1_PD
+};
+
 struct AdlGameDescription {
 	ADGameDescription desc;
 	GameType gameType;

engines/adl/detection_enums.h

@@ -1,69 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ADL_DETECTION_ENUMS_H
-#define ADL_DETECTION_ENUMS_H
-
-namespace Adl {
-
-#define SAVEGAME_VERSION 0
-#define SAVEGAME_NAME_LEN 32
-
-enum GameType {
-	GAME_TYPE_NONE,
-	GAME_TYPE_HIRES0,
-	GAME_TYPE_HIRES1,
-	GAME_TYPE_HIRES2,
-	GAME_TYPE_HIRES3,
-	GAME_TYPE_HIRES4,
-	GAME_TYPE_HIRES5,
-	GAME_TYPE_HIRES6
-};
-
-/*
- * ====== Mystery House supported versions ======
- * GAME_VER_HR1_SIMI:
- * - Instructions always shown (no prompt)
- * - Instructions contain Simi Valley address
- * - On-Line Systems title screen in main executable only and waits for key
- * GAME_VER_HR1_COARSE:
- * - Longer instructions, now containing Coarsegold address
- * - On-Line Systems title screen with instructions prompt
- * GAME_VER_HR1_PD:
- * - Public Domain disclaimer on startup
- * - Sierra On-Line title screen with instructions prompt
- *
- * Note: there are probably at least two or three more variants
- */
-
-enum GameVersion {
-	GAME_VER_NONE = 0,
-	GAME_VER_HR1_SIMI = 0,
-	GAME_VER_HR1_COARSE,
-	GAME_VER_HR1_PD
-};
-
-struct AdlGameDescription;
-
-} // End of namespace Adl
-
-#endif // ADL_DETECTION_ENUMS_H

engines/adl/hires4.cpp

@@ -29,7 +29,7 @@
 #include "common/memstream.h"
 
 #include "adl/adl_v3.h"
-#include "adl/detection_enums.h"
+#include "adl/detection.h"
 #include "adl/display_a2.h"
 #include "adl/graphics.h"
 #include "adl/disk.h"

engines/adl/hires5.cpp

@@ -27,7 +27,7 @@
 #include "common/stream.h"
 
 #include "adl/adl_v4.h"
-#include "adl/detection_enums.h"
+#include "adl/detection.h"
 #include "adl/display_a2.h"
 #include "adl/graphics.h"
 #include "adl/disk.h"

engines/adl/metaengine.cpp

@@ -28,7 +28,6 @@
 
 #include "graphics/thumbnail.h"
 
-#include "adl/detection_enums.h"
 #include "adl/detection.h"
 #include "adl/disk_image_helpers.h"
 

engines/agi/agi.h

@@ -44,7 +44,7 @@
 #include "agi/picture.h"
 #include "agi/logic.h"
 #include "agi/sound.h"
-#include "agi/detection_enums.h"
+#include "agi/detection.h"
 
 namespace Common {
 class RandomSource;
@@ -105,8 +105,6 @@ typedef signed int Err;
 
 #define CMD_BSIZE 12
 
-struct AGIGameDescription;
-
 enum {
 	NO_GAMEDIR = 0,
 	GAMEDIR

engines/agi/detection.cpp

@@ -28,7 +28,6 @@
 #include "base/plugins.h"
 #include "engines/advancedDetector.h"
 
-#include "agi/detection_enums.h"
 #include "agi/detection.h"
 #include "agi/wagparser.h" // for fallback detection
 

engines/agi/detection.h

@@ -23,8 +23,60 @@
 #ifndef AGI_DETECTION_H
 #define AGI_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Agi {
 
+enum AgiGameType {
+	GType_PreAGI = 0,
+	GType_V1 = 1,
+	GType_V2 = 2,
+	GType_V3 = 3
+};
+
+enum AgiGameID {
+	GID_AGIDEMO,
+	GID_BC,
+	GID_DDP,
+	GID_GOLDRUSH,
+	GID_KQ1,
+	GID_KQ2,
+	GID_KQ3,
+	GID_KQ4,
+	GID_LSL1,
+	GID_MH1,
+	GID_MH2,
+	GID_MIXEDUP,
+	GID_PQ1,
+	GID_SQ1,
+	GID_SQ2,
+	GID_XMASCARD,
+	GID_FANMADE,
+	GID_GETOUTTASQ, // Fanmade
+	GID_MICKEY,     // PreAGI
+	GID_WINNIE,     // PreAGI
+	GID_TROLL       // PreAGI
+};
+
+//
+// GF_OLDAMIGAV20 means that the interpreter is an old Amiga AGI interpreter that
+// uses value 20 for the computer type (v20 i.e. vComputer) rather than the usual value 5.
+//
+enum AgiGameFeatures {
+	GF_AGIMOUSE    = (1 << 0), // this disables "Click-to-walk mouse interface"
+	GF_AGDS        = (1 << 1),
+	GF_AGI256      = (1 << 2), // marks fanmade AGI-256 games
+	GF_MACGOLDRUSH = (1 << 3), // use "grdir" instead of "dir" for volume loading
+	GF_FANMADE     = (1 << 4), // marks fanmade games
+	GF_OLDAMIGAV20 = (1 << 5),
+	GF_2GSOLDSOUND = (1 << 6)
+};
+
+enum BooterDisks {
+	BooterDisk1 = 0,
+	BooterDisk2 = 1
+};
+
 struct AGIGameDescription {
 	ADGameDescription desc;
 

engines/agi/detection_enums.h

@@ -1,80 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef AGI_DETECTION_ENUMS_H
-#define AGI_DETECTION_ENUMS_H
-
-namespace Agi {
-
-enum AgiGameType {
-	GType_PreAGI = 0,
-	GType_V1 = 1,
-	GType_V2 = 2,
-	GType_V3 = 3
-};
-
-enum AgiGameID {
-	GID_AGIDEMO,
-	GID_BC,
-	GID_DDP,
-	GID_GOLDRUSH,
-	GID_KQ1,
-	GID_KQ2,
-	GID_KQ3,
-	GID_KQ4,
-	GID_LSL1,
-	GID_MH1,
-	GID_MH2,
-	GID_MIXEDUP,
-	GID_PQ1,
-	GID_SQ1,
-	GID_SQ2,
-	GID_XMASCARD,
-	GID_FANMADE,
-	GID_GETOUTTASQ, // Fanmade
-	GID_MICKEY,     // PreAGI
-	GID_WINNIE,     // PreAGI
-	GID_TROLL       // PreAGI
-};
-
-//
-// GF_OLDAMIGAV20 means that the interpreter is an old Amiga AGI interpreter that
-// uses value 20 for the computer type (v20 i.e. vComputer) rather than the usual value 5.
-//
-enum AgiGameFeatures {
-	GF_AGIMOUSE    = (1 << 0), // this disables "Click-to-walk mouse interface"
-	GF_AGDS        = (1 << 1),
-	GF_AGI256      = (1 << 2), // marks fanmade AGI-256 games
-	GF_MACGOLDRUSH = (1 << 3), // use "grdir" instead of "dir" for volume loading
-	GF_FANMADE     = (1 << 4), // marks fanmade games
-	GF_OLDAMIGAV20 = (1 << 5),
-	GF_2GSOLDSOUND = (1 << 6)
-};
-
-enum BooterDisks {
-	BooterDisk1 = 0,
-	BooterDisk2 = 1
-};
-
-} // End of namespace Agi
-
-#endif // AGI_DETECTION_ENUMS_H

engines/agos/agos.h

@@ -35,7 +35,7 @@
 #include "audio/mixer.h"
 
 #include "agos/vga.h"
-#include "agos/detection_enums.h"
+#include "agos/detection.h"
 
 /**
  * This is the namespace of the AGOS engine.
@@ -184,8 +184,6 @@ enum EventType {
 	MONSTER_DAMAGE_EVENT = 1 << 5
 };
 
-struct AGOSGameDescription;
-
 struct GameSpecificSettings;
 
 class Debugger;

engines/agos/detection.cpp

@@ -30,7 +30,6 @@
 #include "common/installshield_cab.h"
 
 #include "agos/detection.h"
-#include "agos/detection_enums.h"
 #include "agos/intern_detection.h"
 #include "agos/obsolete.h" // Obsolete ID table.
 

engines/agos/detection.h

@@ -23,8 +23,21 @@
 #ifndef AGOS_DETECTION_H
 #define AGOS_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace AGOS {
 
+enum SIMONGameType {
+	GType_PN = 0,
+	GType_ELVIRA1 = 1,
+	GType_ELVIRA2 = 2,
+	GType_WW = 3,
+	GType_SIMON1 = 4,
+	GType_SIMON2 = 5,
+	GType_FF = 6,
+	GType_PP = 7
+};
+
 struct AGOSGameDescription {
 	ADGameDescription desc;
 

engines/agos/detection_enums.h

@@ -1,42 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef AGOS_DETECTION_ENUMS_H
-#define AGOS_DETECTION_ENUMS_H
-
-namespace AGOS {
-
-// Enums related to detection, from the main agos/agos.h file.
-enum SIMONGameType {
-	GType_PN = 0,
-	GType_ELVIRA1 = 1,
-	GType_ELVIRA2 = 2,
-	GType_WW = 3,
-	GType_SIMON1 = 4,
-	GType_SIMON2 = 5,
-	GType_FF = 6,
-	GType_PP = 7
-};
-
-} // End of namespace AGOS
-
-#endif // AGOS_DETECTION_ENUMS_H

engines/agos/obsolete.h

@@ -20,6 +20,8 @@
  *
  */
 
+#ifndef AGOS_OBSOLETE_H
+#define AGOS_OBSOLETE_H
 
 static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = {
 	{"simon1acorn", "simon1", Common::kPlatformAcorn},
@@ -35,3 +37,5 @@ static const Engines::ObsoleteGameID obsoleteGameIDsTable[] = {
 	{"simon2win", "simon2", Common::kPlatformWindows},
 	{0, 0, Common::kPlatformUnknown}
 };
+
+#endif // AGOS_OBSOLETE_H

engines/bbvs/bbvs.h

@@ -36,7 +36,7 @@
 
 #include "engines/engine.h"
 
-#include "bbvs/detection_enums.h"
+#include "bbvs/detection.h"
 
 struct ADGameDescription;
 

engines/bbvs/detection.cpp

@@ -23,7 +23,7 @@
 #include "engines/advancedDetector.h"
 #include "base/plugins.h"
 
-#include "bbvs/detection_enums.h"
+#include "bbvs/detection.h"
 
 static const PlainGameDescriptor bbvsGames[] = {
 	{ "bbvs", "Beavis and Butt-head in Virtual Stupidity" },

engines/bbvs/detection.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef BBVS_DETECTION_ENUMS_H
+#ifndef BBVS_DETECTION_H
-#define BBVS_DETECTION_ENUMS_H
+#define BBVS_DETECTION_H
 
 namespace Bbvs {
 
@@ -31,4 +31,4 @@ enum {
 
 } // End of namespace Bbvs
 
-#endif // BBVS_DETECTION_ENUMS_H
+#endif // BBVS_DETECTION_H

engines/cine/cine.h

@@ -48,7 +48,7 @@
 #include "cine/various.h"
 #include "cine/console.h"
 #include "cine/sound.h"
-#include "cine/detection_enums.h"
+#include "cine/detection.h"
 
 //#define DUMP_SCRIPTS
 
@@ -82,7 +82,6 @@
  */
 namespace Cine {
 
-struct CINEGameDescription;
 struct SeqListElement;
 
 struct VolumeResource {

engines/cine/detection.cpp

@@ -27,7 +27,6 @@
 #include "common/translation.h"
 
 #include "cine/detection.h"
-#include "cine/detection_enums.h"
 
 static const PlainGameDescriptor cineGames[] = {
 	{"fw", "Future Wars"},

engines/cine/detection.h

@@ -23,8 +23,22 @@
 #ifndef CINE_DETECTION_H
 #define CINE_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Cine {
 
+enum CineGameType {
+	GType_FW = 1,
+	GType_OS
+};
+
+enum CineGameFeatures {
+	GF_CD =   1 << 0,
+	GF_DEMO = 1 << 1,
+	GF_ALT_FONT = 1 << 2,
+	GF_CRYPTED_BOOT_PRC = 1 << 3
+};
+
 struct CINEGameDescription {
 	ADGameDescription desc;
 

engines/cine/detection_enums.h

@@ -1,42 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef CINE_DETECTION_ENUMS_H
-#define CINE_DETECTION_ENUMS_H
-
-namespace Cine {
-
-enum CineGameType {
-	GType_FW = 1,
-	GType_OS
-};
-
-enum CineGameFeatures {
-	GF_CD =   1 << 0,
-	GF_DEMO = 1 << 1,
-	GF_ALT_FONT = 1 << 2,
-	GF_CRYPTED_BOOT_PRC = 1 << 3
-};
-
-} // End of namespace Cine
-
-#endif // CINE_DETECTION_ENUMS_H

engines/composer/composer.h

@@ -44,7 +44,7 @@
 
 #include "composer/resource.h"
 #include "composer/console.h"
-#include "composer/detection_enums.h"
+#include "composer/detection.h"
 
 namespace Audio {
 	class QueuingAudioStream;
@@ -52,8 +52,6 @@ namespace Audio {
 
 namespace Composer {
 
-struct ComposerGameDescription;
-
 class Archive;
 struct Animation;
 class ComposerEngine;

engines/composer/detection.cpp

@@ -23,7 +23,6 @@
 #include "base/plugins.h"
 #include "engines/advancedDetector.h"
 
-#include "composer/detection_enums.h"
 #include "composer/detection.h"
 
 static const PlainGameDescriptor composerGames[] = {

engines/composer/detection.h

@@ -23,8 +23,21 @@
 #ifndef COMPOSER_DETECTION_H
 #define COMPOSER_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Composer {
 
+enum GameType {
+	GType_ComposerV1,
+	GType_ComposerV2
+};
+
+enum GameFileTypes {
+	GAME_CONFIGFILE     = 1 << 0,    // Game configuration
+	GAME_SCRIPTFILE     = 1 << 1,    // Game script
+	GAME_EXECUTABLE     = 1 << 2     // Game executable
+};
+
 struct ComposerGameDescription {
 	ADGameDescription desc;
 

engines/composer/detection_enums.h

@@ -1,41 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef COMPOSER_DETECTION_ENUMS_H
-#define COMPOSER_DETECTION_ENUMS_H
-
-namespace Composer {
-
-enum GameType {
-	GType_ComposerV1,
-	GType_ComposerV2
-};
-
-enum GameFileTypes {
-	GAME_CONFIGFILE     = 1 << 0,    // Game configuration
-	GAME_SCRIPTFILE     = 1 << 1,    // Game script
-	GAME_EXECUTABLE     = 1 << 2     // Game executable
-};
-
-} // End of namespace Composer
-
-#endif // COMPOSER_DETECTION_ENUMS_H

engines/cryomni3d/cryomni3d.h

@@ -38,7 +38,7 @@
 #include "cryomni3d/font_manager.h"
 #include "cryomni3d/objects.h"
 #include "cryomni3d/sprites.h"
-#include "cryomni3d/detection_enums.h"
+#include "cryomni3d/detection.h"
 
 class OSystem;
 
@@ -64,8 +64,6 @@ namespace CryOmni3D {
 
 class DATSeekableStream;
 
-struct CryOmni3DGameDescription;
-
 // Engine Debug Flags
 enum {
 	kDebugFile     = (1 << 0),

engines/cryomni3d/detection.cpp

@@ -28,7 +28,6 @@
 #include "common/md5.h"
 
 #include "cryomni3d/detection.h"
-#include "cryomni3d/detection_enums.h"
 
 namespace CryOmni3D {
 

engines/cryomni3d/detection.h

@@ -23,8 +23,28 @@
 #ifndef CRYOMNI3D_DETECTION_H
 #define CRYOMNI3D_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace CryOmni3D {
 
+enum CryOmni3DGameType {
+	GType_VERSAILLES
+};
+
+enum CryOmni3DGameFeatures {
+	GF_VERSAILLES_FONTS_MASK               = (3 << 0), // Fonts flag mask
+	GF_VERSAILLES_FONTS_NUMERIC            = (0 << 0), // Fonts are font01.crf, ...
+	GF_VERSAILLES_FONTS_SET_A              = (1 << 0), // Fonts are for French Macintosh (development version)
+	GF_VERSAILLES_FONTS_SET_B              = (2 << 0), // Standard set (Helvet12 is used for debugging docs)
+	GF_VERSAILLES_FONTS_SET_C              = (3 << 0), // Fonts for Italian version (Helvet12 is used for docs texts)
+
+	GF_VERSAILLES_AUDIOPADDING_NO          = (0 << 2), // Audio files have underscore padding before extension
+	GF_VERSAILLES_AUDIOPADDING_YES         = (1 << 2), // Audio files have underscore padding before extension
+
+	GF_VERSAILLES_LINK_STANDARD            = (0 << 3), // Links file is lien_doc.txt
+	GF_VERSAILLES_LINK_LOCALIZED           = (1 << 3)  // Links file is taken from cryomni3d.dat
+};
+
 struct CryOmni3DGameDescription {
 	ADGameDescription desc;
 

engines/cryomni3d/detection_enums.h

@@ -1,48 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef CRYOMNI3D_DETECTION_ENUMS_H
-#define CRYOMNI3D_DETECTION_ENUMS_H
-
-namespace CryOmni3D {
-
-enum CryOmni3DGameType {
-	GType_VERSAILLES
-};
-
-enum CryOmni3DGameFeatures {
-	GF_VERSAILLES_FONTS_MASK               = (3 << 0), // Fonts flag mask
-	GF_VERSAILLES_FONTS_NUMERIC            = (0 << 0), // Fonts are font01.crf, ...
-	GF_VERSAILLES_FONTS_SET_A              = (1 << 0), // Fonts are for French Macintosh (development version)
-	GF_VERSAILLES_FONTS_SET_B              = (2 << 0), // Standard set (Helvet12 is used for debugging docs)
-	GF_VERSAILLES_FONTS_SET_C              = (3 << 0), // Fonts for Italian version (Helvet12 is used for docs texts)
-
-	GF_VERSAILLES_AUDIOPADDING_NO          = (0 << 2), // Audio files have underscore padding before extension
-	GF_VERSAILLES_AUDIOPADDING_YES         = (1 << 2), // Audio files have underscore padding before extension
-
-	GF_VERSAILLES_LINK_STANDARD            = (0 << 3), // Links file is lien_doc.txt
-	GF_VERSAILLES_LINK_LOCALIZED           = (1 << 3)  // Links file is taken from cryomni3d.dat
-};
-
-} // End of namespace CryOmni3D
-
-#endif // CRYOMNI3D_DETECTION_ENUMS_H

engines/director/detection.cpp

@@ -26,7 +26,6 @@
 
 #include "common/file.h"
 
-#include "director/detection_enums.h"
 #include "director/detection.h"
 
 static const PlainGameDescriptor directorGames[] = {

engines/director/detection.h

@@ -23,8 +23,16 @@
 #ifndef DIRECTOR_DETECTION_H
 #define DIRECTOR_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Director {
 
+enum DirectorGameGID {
+	GID_GENERIC,
+	GID_TEST,
+	GID_TESTALL
+};
+
 struct DirectorGameDescription {
 	ADGameDescription desc;
 

engines/director/detection_enums.h

@@ -1,36 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef DIRECTOR_DETECTION_ENUMS_H
-#define DIRECTOR_DETECTION_ENUMS_H
-
-namespace Director {
-
-enum DirectorGameGID {
-	GID_GENERIC,
-	GID_TEST,
-	GID_TESTALL
-};
-
-} // End of namespace Director
-
-#endif // DIRECTOR_DETECTION_ENUMS_H

engines/director/director.h

@@ -36,7 +36,7 @@
 
 #include "director/types.h"
 #include "director/util.h"
-#include "director/detection_enums.h"
+#include "director/detection.h"
 
 namespace Common {
 class MacResManager;
@@ -56,7 +56,6 @@ namespace Director {
 
 class Archive;
 class Cast;
-struct DirectorGameDescription;
 class DirectorSound;
 class Lingo;
 class Movie;

engines/dm/detection.cpp

@@ -29,7 +29,6 @@
 #include "base/plugins.h"
 #include "engines/advancedDetector.h"
 
-#include "dm/detection_enums.h"
 #include "dm/detection.h"
 
 namespace DM {

engines/dm/detection.h

@@ -28,8 +28,46 @@
 #ifndef DM_DETECTION_H
 #define DM_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace DM {
 
+enum OriginalSaveFormat {
+	kDMSaveFormatAcceptAny = -1,
+	kDMSaveFormatEndOfList = 0,
+	kDMSaveFormatNone = 0,
+	kDMSaveFormatAtari = 1,
+	kDMSaveFormatAmigaPC98FmTowns = 2,
+	kCSBSaveFormatAtari = 2,
+	kDMSaveFormatAppleIIgs = 3,
+	kDMSaveFormatAmiga36PC = 5,
+	kCSBSaveFormatAmigaPC98FmTowns = 5,
+	kDMSaveFormatTotal
+};
+
+enum OriginalSavePlatform {
+	kDMSavePlatformAcceptAny = -1,
+	kDMSavePlatformEndOfList = 0,
+	kDMSavePlatformNone = 0,
+	kDMSavePlatformAtariSt = 1, // @ C1_PLATFORM_ATARI_ST
+	kDMSavePlatformAppleIIgs = 2, // @ C2_PLATFORM_APPLE_IIGS
+	kDMSavePlatformAmiga = 3, // @ C3_PLATFORM_AMIGA
+	kDMSavePlatformPC98 = 5, // @ C5_PLATFORM_PC98
+	kDMSavePlatformX68000 = 6, // @ C6_PLATFORM_X68000
+	kDMSavePlatformFmTownsEN = 7, // @ C7_PLATFORM_FM_TOWNS_EN
+	kDMSavePlatformFmTownsJP = 8, // @ C8_PLATFORM_FM_TOWNS_JP
+	kDMSavePlatformPC = 9, // @ C9_PLATFORM_PC
+	kDMSavePlatformTotal
+};
+
+enum SaveTarget {
+	kDMSaveTargetAcceptAny = -1,
+	kDMSaveTargetEndOfList = 0,
+	kDMSaveTargetNone = 0,
+	kDMSaveTargetDM21 = 1,
+	kDMSaveTargetTotal
+};
+
 struct DMADGameDescription {
 	ADGameDescription _desc;
 

engines/dm/detection_enums.h

@@ -1,71 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
-*
-* ScummVM is the legal property of its developers, whose names
-* are too numerous to list here. Please refer to the COPYRIGHT
-* file distributed with this source distribution.
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-*
-*/
-
-/*
-* Based on the Reverse Engineering work of Christophe Fontanel,
-* maintainer of the Dungeon Master Encyclopaedia (http://dmweb.free.fr/)
-*/
-
-#ifndef DM_DETECTION_ENUMS_H
-#define DM_DETECTION_ENUMS_H
-
-namespace DM {
-
-enum OriginalSaveFormat {
-	kDMSaveFormatAcceptAny = -1,
-	kDMSaveFormatEndOfList = 0,
-	kDMSaveFormatNone = 0,
-	kDMSaveFormatAtari = 1,
-	kDMSaveFormatAmigaPC98FmTowns = 2,
-	kCSBSaveFormatAtari = 2,
-	kDMSaveFormatAppleIIgs = 3,
-	kDMSaveFormatAmiga36PC = 5,
-	kCSBSaveFormatAmigaPC98FmTowns = 5,
-	kDMSaveFormatTotal
-};
-
-enum OriginalSavePlatform {
-	kDMSavePlatformAcceptAny = -1,
-	kDMSavePlatformEndOfList = 0,
-	kDMSavePlatformNone = 0,
-	kDMSavePlatformAtariSt = 1, // @ C1_PLATFORM_ATARI_ST
-	kDMSavePlatformAppleIIgs = 2, // @ C2_PLATFORM_APPLE_IIGS
-	kDMSavePlatformAmiga = 3, // @ C3_PLATFORM_AMIGA
-	kDMSavePlatformPC98 = 5, // @ C5_PLATFORM_PC98
-	kDMSavePlatformX68000 = 6, // @ C6_PLATFORM_X68000
-	kDMSavePlatformFmTownsEN = 7, // @ C7_PLATFORM_FM_TOWNS_EN
-	kDMSavePlatformFmTownsJP = 8, // @ C8_PLATFORM_FM_TOWNS_JP
-	kDMSavePlatformPC = 9, // @ C9_PLATFORM_PC
-	kDMSavePlatformTotal
-};
-
-enum SaveTarget {
-	kDMSaveTargetAcceptAny = -1,
-	kDMSaveTargetEndOfList = 0,
-	kDMSaveTargetNone = 0,
-	kDMSaveTargetDM21 = 1,
-	kDMSaveTargetTotal
-};
-
-} // End of namespace DM
-
-#endif // DM_DETECTION_ENUMS_H

engines/dm/dm.h

@@ -39,11 +39,8 @@
 #include "advancedDetector.h"
 
 #include "dm/console.h"
-#include "dm/detection_enums.h"
 #include "dm/detection.h"
 
-struct ADGameDescription;
-
 namespace DM {
 
 class DisplayMan;

engines/dragons/detection.cpp

@@ -22,7 +22,6 @@
 
 #include "engines/advancedDetector.h"
 #include "base/plugins.h"
-#include "dragons/detection_enums.h"
 #include "dragons/detection.h"
 
 static const PlainGameDescriptor dragonsGames[] = {

engines/dragons/detection.h

@@ -23,8 +23,15 @@
 #ifndef DRAGONS_DETECTION_H
 #define DRAGONS_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Dragons {
 
+enum {
+	kGameIdDragons = 1,
+	kGameIdDragonsBadExtraction = 2
+};
+
 struct DragonsGameDescription {
 	ADGameDescription desc;
 	int gameId;

engines/dragons/detection_enums.h

@@ -1,35 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef DRAGONS_DETECTION_ENUMS_H
-#define DRAGONS_DETECTION_ENUMS_H
-
-namespace Dragons {
-
-enum {
-	kGameIdDragons = 1,
-	kGameIdDragonsBadExtraction = 2
-};
-
-} // End of namespace Dragons
-
-#endif // DRAGONS_DETECTION_ENUMS_H

engines/dragons/dragons.h

@@ -25,7 +25,6 @@
 #include "gui/EventRecorder.h"
 #include "engines/engine.h"
 #include "dragons/specialopcodes.h"
-#include "dragons/detection_enums.h"
 #include "dragons/detection.h"
 
 namespace Dragons {

engines/drascula/detection.cpp

@@ -26,7 +26,6 @@
 
 #include "engines/advancedDetector.h"
 
-#include "drascula/detection_enums.h"
 #include "drascula/detection.h"
 
 static const PlainGameDescriptor drasculaGames[] = {

engines/drascula/detection.h

@@ -20,10 +20,21 @@
  *
  */
 
+#ifndef DRASCULA_DETECTION_H
+#define DRASCULA_DETECTION_H
+
+#include "engines/advancedDetector.h"
+
 namespace Drascula {
 
+enum DrasculaGameFeatures {
+	GF_PACKED = (1 << 0)
+};
+
 struct DrasculaGameDescription {
 	ADGameDescription desc;
 };
 
 } // End of namespace Drascula
+
+#endif // DRASCULA_DETECTION_H

engines/drascula/detection_enums.h

@@ -1,29 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-namespace Drascula {
-
-enum DrasculaGameFeatures {
-	GF_PACKED = (1 << 0)
-};
-
-} // End of namespace Drascula

engines/drascula/drascula.h

@@ -39,7 +39,7 @@
 #include "engines/savestate.h"
 
 #include "drascula/console.h"
-#include "drascula/detection_enums.h"
+#include "drascula/detection.h"
 
 #include "audio/mixer.h"
 

engines/gob/detection/detection.cpp

@@ -24,7 +24,7 @@
 #include "engines/advancedDetector.h"
 
 #include "gob/dataio.h"
-#include "gob/detection/detection_enums.h"
+#include "gob/detection/detection.h"
 #include "gob/detection/tables.h"
 
 class GobMetaEngine : public AdvancedMetaEngine {

engines/gob/detection/detection.h

@@ -23,8 +23,52 @@
 #ifndef GOB_DETECTION_H
 #define GOB_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Gob {
 
+// WARNING: Reordering these will invalidate save games!
+//          Add new games to the bottom of the list.
+enum GameType {
+	kGameTypeNone = 0,
+	kGameTypeGob1,
+	kGameTypeGob2,
+	kGameTypeGob3,
+	kGameTypeWoodruff,
+	kGameTypeBargon,
+	kGameTypeWeen,
+	kGameTypeLostInTime,
+	kGameTypeInca2,
+	kGameTypeDynasty,
+	kGameTypeUrban,
+	kGameTypePlaytoons,
+	kGameTypeBambou,
+	kGameTypeFascination,
+	kGameTypeGeisha,
+	kGameTypeAdi2,
+	kGameTypeAdi4,
+	kGameTypeAdibou2,
+	kGameTypeAdibou1,
+	kGameTypeAbracadabra,
+	kGameTypeBabaYaga,
+	kGameTypeLittleRed,
+	kGameTypeOnceUponATime, // Need more inspection to see if Baba Yaga or Abracadabra
+	kGameTypeAJWorld,
+	kGameTypeCrousti
+};
+
+enum Features {
+	kFeaturesNone      =      0,
+	kFeaturesCD        = 1 << 0,
+	kFeaturesEGA       = 1 << 1,
+	kFeaturesAdLib     = 1 << 2,
+	kFeaturesSCNDemo   = 1 << 3,
+	kFeaturesBATDemo   = 1 << 4,
+	kFeatures640x480   = 1 << 5,
+	kFeatures800x600   = 1 << 6,
+	kFeaturesTrueColor = 1 << 7
+};
+
 struct GOBGameDescription {
 	ADGameDescription desc;
 

engines/gob/detection/detection_enums.h

@@ -1,72 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GOB_DETECTION_ENUMS_H
-#define GOB_DETECTION_ENUMS_H
-
-namespace Gob {
-
-// WARNING: Reordering these will invalidate save games!
-//          Add new games to the bottom of the list.
-enum GameType {
-	kGameTypeNone = 0,
-	kGameTypeGob1,
-	kGameTypeGob2,
-	kGameTypeGob3,
-	kGameTypeWoodruff,
-	kGameTypeBargon,
-	kGameTypeWeen,
-	kGameTypeLostInTime,
-	kGameTypeInca2,
-	kGameTypeDynasty,
-	kGameTypeUrban,
-	kGameTypePlaytoons,
-	kGameTypeBambou,
-	kGameTypeFascination,
-	kGameTypeGeisha,
-	kGameTypeAdi2,
-	kGameTypeAdi4,
-	kGameTypeAdibou2,
-	kGameTypeAdibou1,
-	kGameTypeAbracadabra,
-	kGameTypeBabaYaga,
-	kGameTypeLittleRed,
-	kGameTypeOnceUponATime, // Need more inspection to see if Baba Yaga or Abracadabra
-	kGameTypeAJWorld,
-	kGameTypeCrousti
-};
-
-enum Features {
-	kFeaturesNone      =      0,
-	kFeaturesCD        = 1 << 0,
-	kFeaturesEGA       = 1 << 1,
-	kFeaturesAdLib     = 1 << 2,
-	kFeaturesSCNDemo   = 1 << 3,
-	kFeaturesBATDemo   = 1 << 4,
-	kFeatures640x480   = 1 << 5,
-	kFeatures800x600   = 1 << 6,
-	kFeaturesTrueColor = 1 << 7
-};
-
-} // End of namespace Gob
-
-#endif // GOB_DETECTION_ENUMS_H

engines/gob/gob.h

@@ -31,7 +31,7 @@
 #include "engines/engine.h"
 
 #include "gob/console.h"
-#include "gob/detection/detection_enums.h"
+#include "gob/detection/detection.h"
 
 /**
  * This is the namespace of the Gob engine.
@@ -126,8 +126,6 @@ enum {
 	kDebugDemo       = 1 << 11
 };
 
-struct GOBGameDescription;
-
 class GobEngine : public Engine {
 private:
 	GameType _gameType;

engines/groovie/detection.cpp

@@ -24,7 +24,6 @@
 #include "common/translation.h"
 
 #include "engines/advancedDetector.h"
-#include "groovie/detection_enums.h"
 #include "groovie/detection.h"
 
 namespace Groovie {

engines/groovie/detection.h

@@ -27,6 +27,11 @@
 
 namespace Groovie {
 
+enum EngineVersion {
+	kGroovieT7G,
+	kGroovieV2
+};
+
 struct GroovieGameDescription {
 	ADGameDescription desc;
 

engines/groovie/detection_enums.h

@@ -1,35 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GROOVIE_DETECTION_ENUMS_H
-#define GROOVIE_DETECTION_ENUMS_H
-
-namespace Groovie {
-
-enum EngineVersion {
-	kGroovieT7G,
-	kGroovieV2
-};
-
-} // End of namespace Groovie
-
-#endif // !GROOVIE_DETECTION_ENUMS_H

engines/groovie/groovie.h

@@ -28,7 +28,7 @@
 
 #include "engines/engine.h"
 #include "graphics/pixelformat.h"
-#include "groovie/detection_enums.h"
+#include "groovie/detection.h"
 
 namespace Common {
 class MacResManager;

engines/groovie/script.h

@@ -24,7 +24,6 @@
 #define GROOVIE_SCRIPT_H
 
 #include "groovie/groovie.h"
-#include "groovie/detection_enums.h"
 
 #include "common/random.h"
 #include "common/rect.h"

engines/hdb/detection.cpp

@@ -24,7 +24,7 @@
 #include "common/translation.h"
 #include "engines/advancedDetector.h"
 
-#include "hdb/detection_enums.h"
+#include "hdb/detection.h"
 
 static const PlainGameDescriptor hdbGames[] = {
 	{"hdb", "Hyperspace Delivery Boy!"},

engines/hdb/metaengine.cpp

@@ -34,7 +34,7 @@
 
 #include "hdb/hdb.h"
 #include "hdb/input.h"
-#include "hdb/detection_enums.h"
+#include "hdb/detection.h"
 
 namespace HDB {
 

engines/hugo/detection.cpp

@@ -23,7 +23,6 @@
 #include "base/plugins.h"
 #include "engines/advancedDetector.h"
 
-#include "hugo/detection_enums.h"
 #include "hugo/detection.h"
 
 namespace Hugo {

engines/hugo/detection.h

@@ -23,8 +23,31 @@
 #ifndef HUGO_DETECTION_H
 #define HUGO_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Hugo {
 
+enum HugoGameFeatures {
+	GF_PACKED = (1 << 0) // Database
+};
+
+enum GameType {
+	kGameTypeNone  = 0,
+	kGameTypeHugo1,
+	kGameTypeHugo2,
+	kGameTypeHugo3
+};
+
+enum GameVariant {
+	kGameVariantH1Win = 0,
+	kGameVariantH2Win,
+	kGameVariantH3Win,
+	kGameVariantH1Dos,
+	kGameVariantH2Dos,
+	kGameVariantH3Dos,
+	kGameVariantNone
+};
+
 struct HugoGameDescription {
 	ADGameDescription desc;
 	GameType gameType;

engines/hugo/detection_enums.h

@@ -1,51 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef HUGO_DETECTION_ENUMS_H
-#define HUGO_DETECTION_ENUMS_H
-
-namespace Hugo {
-
-enum HugoGameFeatures {
-	GF_PACKED = (1 << 0) // Database
-};
-
-enum GameType {
-	kGameTypeNone  = 0,
-	kGameTypeHugo1,
-	kGameTypeHugo2,
-	kGameTypeHugo3
-};
-
-enum GameVariant {
-	kGameVariantH1Win = 0,
-	kGameVariantH2Win,
-	kGameVariantH3Win,
-	kGameVariantH1Dos,
-	kGameVariantH2Dos,
-	kGameVariantH3Dos,
-	kGameVariantNone
-};
-
-} // End of namespace Hugo
-
-#endif // HUGO_DETECTION_ENUMS_H

engines/hugo/hugo.h

@@ -27,7 +27,7 @@
 
 // This include is here temporarily while the engine is being refactored.
 #include "hugo/game.h"
-#include "hugo/detection_enums.h"
+#include "hugo/detection.h"
 
 #define HUGO_DAT_VER_MAJ 0                          // 1 byte
 #define HUGO_DAT_VER_MIN 42                         // 1 byte
@@ -146,8 +146,6 @@ enum seqTextEngine {
 	kEsAdvertise = 0
 };
 
-struct HugoGameDescription;
-
 struct Status {                                     // Game status (not saved)
 	bool     _storyModeFl;                          // Game is telling story - no commands
 	bool     _gameOverFl;                           // Game is over - hero knobbled

engines/illusions/detection.cpp

@@ -24,7 +24,6 @@
 
 #include "base/plugins.h"
 
-#include "illusions/detection_enums.h"
 #include "illusions/detection.h"
 
 static const PlainGameDescriptor illusionsGames[] = {

engines/illusions/detection.h

@@ -23,8 +23,15 @@
 #ifndef ILLUSIONS_DETECTION_H
 #define ILLUSIONS_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Illusions {
 
+enum {
+	kGameIdBBDOU   = 1,
+	kGameIdDuckman = 2
+};
+
 struct IllusionsGameDescription {
 	ADGameDescription desc;
 	int gameId;

engines/illusions/detection_enums.h

@@ -1,35 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef ILLUSIONS_DETECTION_ENUMS_H
-#define ILLUSIONS_DETECTION_ENUMS_H
-
-namespace Illusions {
-
-enum {
-	kGameIdBBDOU   = 1,
-	kGameIdDuckman = 2
-};
-
-} // End of namespace Illusions
-
-#endif // ILLUSIONS_DETECTION_ENUMS_H

engines/illusions/illusions.h

@@ -38,7 +38,7 @@
 
 #include "engines/engine.h"
 #include "graphics/surface.h"
-#include "illusions/detection_enums.h"
+#include "illusions/detection.h"
 
 namespace Illusions {
 
@@ -63,7 +63,6 @@ class Cursor;
 class Dictionary;
 struct Fader;
 class FramesList;
-struct IllusionsGameDescription;
 class Input;
 class Screen;
 class ScreenText;

engines/kyra/detection.cpp

@@ -24,7 +24,6 @@
 #include "engines/advancedDetector.h"
 #include "base/plugins.h"
 
-#include "kyra/detection_enums.h"
 #include "kyra/detection.h"
 #include "kyra/detection_tables.h"
 

engines/kyra/detection.h

@@ -23,6 +23,43 @@
 #ifndef KYRA_DETECTION_H
 #define KYRA_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
+namespace Kyra {
+
+enum {
+	GI_KYRA1 = 0,
+	GI_KYRA2 = 1,
+	GI_KYRA3 = 2,
+	GI_LOL = 4,
+	GI_EOB1 = 5,
+	GI_EOB2 = 6
+};
+
+struct GameFlags {
+	Common::Language lang;
+
+	// language overwrites of fan translations (only needed for multilingual games)
+	Common::Language fanLang;
+	Common::Language replacedLang;
+
+	Common::Platform platform;
+
+	bool isDemo               : 1;
+	bool useAltShapeHeader    : 1;    // alternative shape header (uses 2 bytes more, those are unused though)
+	bool isTalkie             : 1;
+	bool isOldFloppy          : 1;
+	bool useHiRes             : 1;
+	bool use16ColorMode       : 1;
+	bool useHiColorMode       : 1;
+	bool useDigSound          : 1;
+	bool useInstallerPackage  : 1;
+
+	byte gameID;
+};
+
+} // End of namespace Kyra
+
 namespace {
 
 struct KYRAGameDescription {

engines/kyra/detection_enums.h

@@ -1,61 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef KYRA_DETECTION_ENUMS_H
-#define KYRA_DETECTION_ENUMS_H
-
-namespace Kyra {
-
-enum {
-	GI_KYRA1 = 0,
-	GI_KYRA2 = 1,
-	GI_KYRA3 = 2,
-	GI_LOL = 4,
-	GI_EOB1 = 5,
-	GI_EOB2 = 6
-};
-
-struct GameFlags {
-	Common::Language lang;
-
-	// language overwrites of fan translations (only needed for multilingual games)
-	Common::Language fanLang;
-	Common::Language replacedLang;
-
-	Common::Platform platform;
-
-	bool isDemo               : 1;
-	bool useAltShapeHeader    : 1;    // alternative shape header (uses 2 bytes more, those are unused though)
-	bool isTalkie             : 1;
-	bool isOldFloppy          : 1;
-	bool useHiRes             : 1;
-	bool use16ColorMode       : 1;
-	bool useHiColorMode       : 1;
-	bool useDigSound          : 1;
-	bool useInstallerPackage  : 1;
-
-	byte gameID;
-};
-
-} // End of namespace Kyra
-
-#endif // KYRA_DETECTION_ENUMS_H

engines/kyra/kyra_v1.h

@@ -36,7 +36,7 @@
 
 #include "kyra/script/script.h"
 #include "kyra/engine/item.h"
-#include "kyra/detection_enums.h"
+#include "kyra/detection.h"
 
 namespace Common {
 class OutSaveFile;

engines/lab/detection.cpp

@@ -29,7 +29,7 @@
  */
 
 #include "engines/advancedDetector.h"
-#include "lab/detection_enums.h"
+#include "lab/detection.h"
 
 static const PlainGameDescriptor lab_setting[] = {
 	{ "lab", "Labyrinth of Time" },

engines/lab/detection.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef LAB_DETECTION_ENUMS_H
+#ifndef LAB_DETECTION_H
-#define LAB_DETECTION_ENUMS_H
+#define LAB_DETECTION_H
 
 namespace Lab {
 
@@ -32,4 +32,4 @@ enum GameFeatures {
 
 } // End of namespace Lab
 
-#endif // LAB_DETECTION_ENUMS_H
+#endif // LAB_DETECTION_H

engines/lab/lab.h

@@ -41,7 +41,7 @@
 #include "lab/console.h"
 #include "lab/image.h"
 #include "lab/labsets.h"
-#include "lab/detection_enums.h"
+#include "lab/detection.h"
 
 struct ADGameDescription;
 

engines/lilliput/detection.cpp

@@ -24,7 +24,6 @@
 #include "engines/advancedDetector.h"
 #include "common/textconsole.h"
 
-#include "lilliput/detection_enums.h"
 #include "lilliput/detection.h"
 
 namespace Lilliput {

engines/lilliput/detection.h

@@ -23,8 +23,16 @@
 #ifndef LILLIPUT_DETECTION_H
 #define LILLIPUT_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Lilliput {
 
+enum GameType {
+	kGameTypeNone  = 0,
+	kGameTypeRobin,
+	kGameTypeRome
+};
+
 struct LilliputGameDescription {
 	ADGameDescription desc;
 	GameType gameType;

engines/lilliput/detection_enums.h

@@ -1,36 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef LILLIPUT_DETECTION_ENUMS_H
-#define LILLIPUT_DETECTION_ENUMS_H
-
-namespace Lilliput {
-
-enum GameType {
-	kGameTypeNone  = 0,
-	kGameTypeRobin,
-	kGameTypeRome
-};
-
-} // End of namespace Lilliput
-
-#endif // LILLIPUT_DETECTION_ENUMS_H

engines/lilliput/lilliput.h

@@ -27,7 +27,7 @@
 #include "lilliput/script.h"
 #include "lilliput/sound.h"
 #include "lilliput/stream.h"
-#include "lilliput/detection_enums.h"
+#include "lilliput/detection.h"
 
 #include "common/file.h"
 #include "common/rect.h"

engines/lure/detection.cpp

@@ -26,7 +26,6 @@
 
 #include "common/translation.h"
 
-#include "lure/detection_enums.h"
 #include "lure/detection.h"
 
 static const PlainGameDescriptor lureGames[] = {

engines/lure/detection.h

@@ -23,8 +23,16 @@
 #ifndef LURE_DETECTION_H
 #define LURE_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Lure {
 
+enum {
+	GF_FLOPPY	= 1 <<  0,
+	GF_EGA		= 1 <<  1,
+	GF_LNGUNK	= 1 << 15
+};
+
 struct LureGameDescription {
 	ADGameDescription desc;
 

engines/lure/detection_enums.h

@@ -1,36 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef LURE_DETECTION_ENUMS_H
-#define LURE_DETECTION_ENUMS_H
-
-namespace Lure {
-
-enum {
-	GF_FLOPPY	= 1 <<  0,
-	GF_EGA		= 1 <<  1,
-	GF_LNGUNK	= 1 << 15
-};
-
-} // End of namespace Lure
-
-#endif // LURE_DETECTION_ENUMS_H

engines/lure/lure.h

@@ -40,7 +40,7 @@
 #include "lure/strings.h"
 #include "lure/room.h"
 #include "lure/fights.h"
-#include "lure/detection_enums.h"
+#include "lure/detection.h"
 
 /**
  * This is the namespace of the Lure engine.

engines/made/detection.cpp

@@ -23,7 +23,6 @@
 #include "base/plugins.h"
 #include "engines/advancedDetector.h"
 
-#include "made/detection_enums.h"
 #include "made/detection.h"
 
 static const PlainGameDescriptor madeGames[] = {

engines/made/detection.h

@@ -23,8 +23,24 @@
 #ifndef MADE_DETECTION_H
 #define MADE_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Made {
 
+enum MadeGameID {
+	GID_RTZ		= 0,
+	GID_MANHOLE	= 1,
+	GID_LGOP2	= 2,
+	GID_RODNEY	= 3
+};
+
+enum MadeGameFeatures {
+	GF_DEMO				= 1 << 0,
+	GF_CD				= 1 << 1,
+	GF_CD_COMPRESSED	= 1 << 2,
+	GF_FLOPPY			= 1 << 3
+};
+
 struct MadeGameDescription {
 	ADGameDescription desc;
 

engines/made/detection_enums.h

@@ -1,44 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef MADE_DETECTION_ENUMS_H
-#define MADE_DETECTION_ENUMS_H
-
-namespace Made {
-
-enum MadeGameID {
-	GID_RTZ		= 0,
-	GID_MANHOLE	= 1,
-	GID_LGOP2	= 2,
-	GID_RODNEY	= 3
-};
-
-enum MadeGameFeatures {
-	GF_DEMO				= 1 << 0,
-	GF_CD				= 1 << 1,
-	GF_CD_COMPRESSED	= 1 << 2,
-	GF_FLOPPY			= 1 << 3
-};
-
-} // End of namespace Made
-
-#endif // MADE_DETECTION_ENUMS_H

engines/made/made.h

@@ -24,7 +24,7 @@
 #define MADE_MADE_H
 
 #include "made/sound.h"
-#include "made/detection_enums.h"
+#include "made/detection.h"
 
 #include "engines/engine.h"
 
@@ -45,8 +45,6 @@ namespace Made {
 
 const uint32 kTimerResolution = 40;
 
-struct MadeGameDescription;
-
 class ResourceReader;
 class PmvPlayer;
 class Screen;

engines/mads/detection.cpp

@@ -27,7 +27,6 @@
 #include "common/system.h"
 #include "common/translation.h"
 
-#include "mads/detection_enums.h"
 #include "mads/detection.h"
 
 static const PlainGameDescriptor MADSGames[] = {

engines/mads/detection.h

@@ -24,8 +24,16 @@
 #ifndef MADS_DETECTION_H
 #define MADS_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace MADS {
 
+enum {
+	GType_RexNebular = 0,
+	GType_Dragonsphere = 1,
+	GType_Phantom = 2
+};
+
 struct MADSGameDescription {
 	ADGameDescription desc;
 

engines/mads/detection_enums.h

@@ -1,36 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef MADS_DETECTION_ENUMS_H
-#define MADS_DETECTION_ENUMS_H
-
-namespace MADS {
-
-enum {
-	GType_RexNebular = 0,
-	GType_Dragonsphere = 1,
-	GType_Phantom = 2
-};
-
-} // End of namespace MADS
-
-#endif // MADS_DETECTION_ENUMS_H

engines/mads/mads.h

@@ -40,7 +40,7 @@
 #include "mads/msurface.h"
 #include "mads/resources.h"
 #include "mads/sound.h"
-#include "mads/detection_enums.h"
+#include "mads/detection.h"
 
 /**
  * This is the namespace of the MADS engine.
@@ -68,8 +68,6 @@ enum ScreenFade {
 	SCREEN_FADE_FAST = 2
 };
 
-struct MADSGameDescription;
-
 
 class MADSEngine : public Engine {
 private:

engines/mohawk/detection.cpp

@@ -28,7 +28,6 @@
 #include "common/translation.h"
 
 #include "mohawk/detection.h"
-#include "mohawk/detection_enums.h"
 
 #include "mohawk/riven_metaengine.h"
 #include "mohawk/myst_metaengine.h"

engines/mohawk/detection.h

@@ -23,8 +23,34 @@
 #ifndef MOHAWK_DETECTION_H
 #define MOHAWK_DETECTION_H
 
+#include "engines/advancedDetector.h"
+
 namespace Mohawk {
 
+enum MohawkGameType {
+	GType_MYST,
+	GType_MAKINGOF,
+	GType_RIVEN,
+	GType_CSTIME,
+	GType_LIVINGBOOKSV1,
+	GType_LIVINGBOOKSV2,
+	GType_LIVINGBOOKSV3,
+	GType_LIVINGBOOKSV4,
+	GType_LIVINGBOOKSV5
+};
+
+#define GAMEOPTION_ME   GUIO_GAMEOPTIONS1
+#define GAMEOPTION_25TH GUIO_GAMEOPTIONS2
+#define GAMEOPTION_DEMO GUIO_GAMEOPTIONS3
+
+enum MohawkGameFeatures {
+	GF_ME             = (1 << 0), // Myst Masterpiece Edition
+	GF_25TH           = (1 << 1), // Myst and Riven 25th Anniversary
+	GF_DVD            = (1 << 2),
+	GF_DEMO           = (1 << 3),
+	GF_LB_10          = (1 << 4)  // very early Living Books 1.0 games
+};
+
 struct MohawkGameDescription {
 	ADGameDescription desc;
 
@@ -35,4 +61,4 @@ struct MohawkGameDescription {
 
 } // End of namespace Mohawk
 
-#endif
+#endif // MOHAWK_DETECTION_H

engines/mohawk/detection_enums.h

@@ -1,54 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef MOHAWK_DETECTION_ENUMS_H
-#define MOHAWK_DETECTION_ENUMS_H
-
-namespace Mohawk {
-
-enum MohawkGameType {
-	GType_MYST,
-	GType_MAKINGOF,
-	GType_RIVEN,
-	GType_CSTIME,
-	GType_LIVINGBOOKSV1,
-	GType_LIVINGBOOKSV2,
-	GType_LIVINGBOOKSV3,
-	GType_LIVINGBOOKSV4,
-	GType_LIVINGBOOKSV5
-};
-
-#define GAMEOPTION_ME   GUIO_GAMEOPTIONS1
-#define GAMEOPTION_25TH GUIO_GAMEOPTIONS2
-#define GAMEOPTION_DEMO GUIO_GAMEOPTIONS3
-
-enum MohawkGameFeatures {
-	GF_ME             = (1 << 0), // Myst Masterpiece Edition
-	GF_25TH           = (1 << 1), // Myst and Riven 25th Anniversary
-	GF_DVD            = (1 << 2),
-	GF_DEMO           = (1 << 3),
-	GF_LB_10          = (1 << 4)  // very early Living Books 1.0 games
-};
-
-} // End of namespace Mohawk
-
-#endif

engines/mohawk/mohawk.h

@@ -28,7 +28,7 @@
 
 #include "engines/engine.h"
 
-#include "mohawk/detection_enums.h"
+#include "mohawk/detection.h"
 
 class OSystem;
 
@@ -47,7 +47,6 @@ class SeekableReadStream;
  */
 namespace Mohawk {
 
-struct MohawkGameDescription;
 class Sound;
 class PauseDialog;
 class Archive;

engines/mortevielle/detection.cpp

@@ -24,7 +24,6 @@
 #include "engines/advancedDetector.h"
 
 #include "mortevielle/detection.h"
-#include "mortevielle/detection_enums.h"
 
 static const PlainGameDescriptor MortevielleGame[] = {
 	{"mortevielle", "Mortville Manor"},