diff options
Diffstat (limited to 'simon/intern.h')
| -rw-r--r-- | simon/intern.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/simon/intern.h b/simon/intern.h index 9128f024a2..c1e66a0958 100644 --- a/simon/intern.h +++ b/simon/intern.h @@ -132,25 +132,26 @@ struct GameSpecificSettings { const char *gamepc_filename; }; -// TODO: the following really should be turned into GameFeatures... enum { - GAME_SIMON2 = 1 << 0, - GAME_WIN = 1 << 1, - GAME_TALKIE = 1 << 2, - GAME_DEMO = 1 << 3, - GAME_MAC = 1 << 4, - GAME_AMIGA = 1 << 5, + GF_SIMON2 = 1 << 0, + GF_WIN = 1 << 1, + GF_TALKIE = 1 << 2, + GF_DEMO = 1 << 3, + GF_MAC = 1 << 4, + GF_AMIGAS = 1 << 5 // rename to GF_AMIGA once the scumm GF_* have been removed from gameDetector.h +}; +enum { GAME_SIMON1DOS = 0, - GAME_SIMON2DOS = GAME_SIMON2, - GAME_SIMON1TALKIE = GAME_TALKIE, - GAME_SIMON2TALKIE = GAME_SIMON2 + GAME_TALKIE, - GAME_SIMON1WIN = GAME_WIN + GAME_TALKIE, - GAME_SIMON2WIN = GAME_SIMON2 + GAME_WIN + GAME_TALKIE, - GAME_SIMON1DEMO = GAME_DEMO, - GAME_SIMON2MAC = GAME_SIMON2WIN + GAME_MAC, - GAME_SIMON1AMIGA = GAME_AMIGA, - GAME_SIMON1CD32 = GAME_SIMON1TALKIE + GAME_AMIGA + GAME_SIMON2DOS = GF_SIMON2, + GAME_SIMON1TALKIE = GF_TALKIE, + GAME_SIMON2TALKIE = GF_SIMON2 | GF_TALKIE, + GAME_SIMON1WIN = GF_WIN | GF_TALKIE, + GAME_SIMON2WIN = GF_SIMON2 | GF_WIN | GF_TALKIE, + GAME_SIMON1DEMO = GF_DEMO, + GAME_SIMON2MAC = GF_SIMON2 | GF_WIN | GF_TALKIE | GF_MAC, + GAME_SIMON1AMIGA = GF_AMIGAS, + GAME_SIMON1CD32 = GF_TALKIE | GF_AMIGAS }; #endif |