1 files changed, 40 insertions, 24 deletions
diff --git a/simon/intern.h b/simon/intern.h
index 3a4bd840fb..c20c90e38a 100644
--- a/simon/intern.h
+++ b/simon/intern.h
@@ -147,30 +147,46 @@ struct GameSpecificSettings {
 
 } // End of namespace Simon
 
-enum {
-	GF_SIMON1     = 1 << 0,
-	GF_SIMON2     = 1 << 1,
-	GF_WIN        = 1 << 2,
-	GF_TALKIE     = 1 << 3,
-	GF_DEMO       = 1 << 4,
-	GF_AMIGA      = 1 << 5,
-	GF_ACORN      = 1 << 6,
-	GF_OLD_BUNDLE = 1 << 7
-};
-
-enum {
-	GAME_SIMON1DOS = GF_SIMON1 | GF_OLD_BUNDLE,
-	GAME_SIMON1DEMO = GF_SIMON1 | GF_DEMO | GF_OLD_BUNDLE,
-	GAME_SIMON1AMIGA = GF_SIMON1 | GF_AMIGA | GF_OLD_BUNDLE,
-	GAME_SIMON1CD32 = GF_SIMON1 | GF_TALKIE | GF_AMIGA | GF_OLD_BUNDLE,
-	GAME_SIMON1ACORN = GF_SIMON1 | GF_TALKIE | GF_ACORN,
-	GAME_SIMON1TALKIE = GF_SIMON1 | GF_TALKIE,
-
-	GAME_SIMON2DOS = GF_SIMON2,
-	GAME_SIMON2TALKIE = GF_SIMON2 | GF_TALKIE,
-	GAME_SIMON2WIN = GF_SIMON2 | GF_WIN | GF_TALKIE,
-
-	GAME_FEEBLEFILES = GF_SIMON2 | GF_WIN | GF_TALKIE | GF_OLD_BUNDLE
+enum GameFeatures {
+	GF_TALKIE     = 1 << 0,
+	GF_OLD_BUNDLE = 1 << 1
+};
+
+enum GameFileTypes {
+	GAME_BASEFILE = 1 << 0,
+	GAME_ICONFILE = 1 << 1,
+	GAME_GMEFILE  = 1 << 2,
+	GAME_STRFILE  = 1 << 3,
+	GAME_TBLFILE  = 1 << 4
+};
+
+enum GameIds {
+	GID_SIMON1DOS,
+	GID_SIMON1DEMO,
+	GID_SIMON1AMIGA,
+	GID_SIMON1CD32,
+	GID_SIMON1ACORN,
+	GID_SIMON1TALKIE,
+	GID_SIMON1TALKIE_DE,
+	GID_SIMON1TALKIE_FR,
+	GID_SIMON1TALKIE_HB,
+	GID_SIMON1TALKIE_IT,
+	GID_SIMON1TALKIE_ES,
+	GID_SIMON1WIN,
+	GID_SIMON1WIN_DE,
+
+	GID_SIMON2DOS,
+	GID_SIMON2DEMO,
+	GID_SIMON2TALKIE,
+	GID_SIMON2TALKIE_DE,
+	GID_SIMON2TALKIE_FR,
+	GID_SIMON2TALKIE_HB,
+	GID_SIMON2TALKIE_IT,
+	GID_SIMON2TALKIE_ES,
+	GID_SIMON2WIN,
+	GID_SIMON2WIN_DE,
+
+	GAME_FEEBLEFILES
 };
 
 #endif