diff options
| author | Max Horn | 2003-06-15 01:42:19 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-15 01:42:19 +0000 |
| commit | 101df28e0b196201ab924cdbb771ba95426ff42d (patch) | |
| tree | 6453d3321cbb2bc3a4b0e9403a6954d94bb829d5 /simon | |
| parent | 9ce9ce620f5210e4293c7c0452509d48fecd0b69 (diff) | |
| download | scummvm-rg350-101df28e0b196201ab924cdbb771ba95426ff42d.tar.gz scummvm-rg350-101df28e0b196201ab924cdbb771ba95426ff42d.tar.bz2 scummvm-rg350-101df28e0b196201ab924cdbb771ba95426ff42d.zip | |
moved GameId declaration to common/engine.h (more logical); moved scumm specific stuff from gameDetector.h to scumm.h; cleaned up some #includes (ideally, never #include something in a header file if you can avoid it - this cuts down interdepencies)
svn-id: r8496
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 046f41bf66..9cd8985081 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -38,18 +38,18 @@ extern bool draw_keyboard; static const VersionSettings simon_settings[] = { // Simon the Sorcerer 1 & 2 (not SCUMM games) - {"simon1dos", "Simon the Sorcerer 1 (DOS)", GID_SIMON_FIRST, 99, GAME_SIMON1DOS, "GAMEPC"}, - {"simon1amiga", "Simon the Sorcerer 1 (Amiga)", GID_SIMON_FIRST, 99, GAME_SIMON1AMIGA, "gameamiga"}, - {"simon2dos", "Simon the Sorcerer 2 (DOS)", GID_SIMON_FIRST, 99, GAME_SIMON2DOS, "GAME32"}, - {"simon1talkie", "Simon the Sorcerer 1 Talkie (DOS)", GID_SIMON_FIRST, 99, GAME_SIMON1TALKIE, "SIMON.GME"}, - {"simon2talkie", "Simon the Sorcerer 2 Talkie (DOS)", GID_SIMON_FIRST, 99, GAME_SIMON2TALKIE, "GSPTR30"}, - {"simon1win", "Simon the Sorcerer 1 Talkie (Windows)", GID_SIMON_FIRST, 99, GAME_SIMON1WIN, "SIMON.GME"}, - {"simon1cd32", "Simon the Sorcerer 1 Talkie (Amiga CD32)", GID_SIMON_FIRST, 99, GAME_SIMON1CD32, "gameamiga"}, - {"simon2win", "Simon the Sorcerer 2 Talkie (Windows)", GID_SIMON_FIRST, 99, GAME_SIMON2WIN, "GSPTR30"}, - {"simon2mac", "Simon the Sorcerer 2 Talkie (Amiga or Mac)", GID_SIMON_FIRST, 99, GAME_SIMON2MAC, "GSPTR30"}, - {"simon1demo", "Simon the Sorcerer 1 (DOS Demo)", GID_SIMON_FIRST, 99, GAME_SIMON1DEMO, "GDEMO"}, - - {NULL, NULL, 0, 0, 0, NULL} + {"simon1dos", "Simon the Sorcerer 1 (DOS)", GID_SIMON_FIRST, 99, VersionSettings::ADLIB_DONT_CARE, GAME_SIMON1DOS, "GAMEPC"}, + {"simon1amiga", "Simon the Sorcerer 1 (Amiga)", GID_SIMON_FIRST, 99, VersionSettings::ADLIB_DONT_CARE, GAME_SIMON1AMIGA, "gameamiga"}, + {"simon2dos", "Simon the Sorcerer 2 (DOS)", GID_SIMON_FIRST, 99, VersionSettings::ADLIB_DONT_CARE, GAME_SIMON2DOS, "GAME32"}, + {"simon1talkie", "Simon the Sorcerer 1 Talkie (DOS)", GID_SIMON_FIRST, 99, VersionSettings::ADLIB_DONT_CARE, GAME_SIMON1TALKIE, "SIMON.GME"}, + {"simon2talkie", "Simon the Sorcerer 2 Talkie (DOS)", GID_SIMON_FIRST, 99, VersionSettings::ADLIB_DONT_CARE, GAME_SIMON2TALKIE, "GSPTR30"}, + {"simon1win", "Simon the Sorcerer 1 Talkie (Windows)", GID_SIMON_FIRST, 99, VersionSettings::ADLIB_DONT_CARE, GAME_SIMON1WIN, "SIMON.GME"}, + {"simon1cd32", "Simon the Sorcerer 1 Talkie (Amiga CD32)", GID_SIMON_FIRST, 99, VersionSettings::ADLIB_DONT_CARE, GAME_SIMON1CD32, "gameamiga"}, + {"simon2win", "Simon the Sorcerer 2 Talkie (Windows)", GID_SIMON_FIRST, 99, VersionSettings::ADLIB_DONT_CARE, GAME_SIMON2WIN, "GSPTR30"}, + {"simon2mac", "Simon the Sorcerer 2 Talkie (Amiga or Mac)", GID_SIMON_FIRST, 99, VersionSettings::ADLIB_DONT_CARE, GAME_SIMON2MAC, "GSPTR30"}, + {"simon1demo", "Simon the Sorcerer 1 (DOS Demo)", GID_SIMON_FIRST, 99, VersionSettings::ADLIB_DONT_CARE, GAME_SIMON1DEMO, "GDEMO"}, + + {NULL, NULL, 0, 0, VersionSettings::ADLIB_DONT_CARE, 0, NULL} }; const VersionSettings *Engine_SIMON_targetList() { |