diff options
author | Travis Howell | 2008-12-14 01:13:59 +0000 |
---|---|---|
committer | Travis Howell | 2008-12-14 01:13:59 +0000 |
commit | bff3c9cf60b68f03250e092ec9303c46b982e715 (patch) | |
tree | fd86992f1464072294ea5bb4138e4cf36e0cc7d6 | |
parent | c75c681175cca1879ad3470cd657b5e8030ed98a (diff) | |
download | scummvm-rg350-bff3c9cf60b68f03250e092ec9303c46b982e715.tar.gz scummvm-rg350-bff3c9cf60b68f03250e092ec9303c46b982e715.tar.bz2 scummvm-rg350-bff3c9cf60b68f03250e092ec9303c46b982e715.zip |
Cleanup.
svn-id: r35348
-rw-r--r-- | engines/agos/detection_tables.h | 78 | ||||
-rw-r--r-- | engines/agos/intern.h | 7 | ||||
-rw-r--r-- | engines/agos/res_snd.cpp | 6 |
3 files changed, 44 insertions, 47 deletions
diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h index 94e67ab941..465987fa60 100644 --- a/engines/agos/detection_tables.h +++ b/engines/agos/detection_tables.h @@ -762,7 +762,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1ACORN, + GID_SIMON1, GF_OLD_BUNDLE }, @@ -786,7 +786,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -810,7 +810,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -833,7 +833,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1AMIGA, + GID_SIMON1, GF_32COLOR | GF_CRUNCHED | GF_OLD_BUNDLE | GF_PLANAR }, @@ -856,7 +856,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1AMIGA, + GID_SIMON1, GF_32COLOR | GF_CRUNCHED | GF_CRUNCHED_GAMEPC | GF_OLD_BUNDLE | GF_PLANAR }, @@ -879,7 +879,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1AMIGA, + GID_SIMON1, GF_CRUNCHED | GF_OLD_BUNDLE | GF_PLANAR }, @@ -902,7 +902,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1AMIGA, + GID_SIMON1, GF_CRUNCHED | GF_OLD_BUNDLE | GF_PLANAR }, @@ -925,7 +925,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1AMIGA, + GID_SIMON1, GF_CRUNCHED | GF_OLD_BUNDLE | GF_PLANAR }, @@ -1248,7 +1248,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1272,7 +1272,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1296,7 +1296,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1320,7 +1320,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1344,7 +1344,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1368,7 +1368,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1392,7 +1392,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1416,7 +1416,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1441,7 +1441,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1465,7 +1465,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1489,7 +1489,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1513,7 +1513,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON1, - GID_SIMON1TALKIE, + GID_SIMON1, GF_TALKIE }, @@ -1537,7 +1537,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2DOS, + GID_SIMON2, 0 }, @@ -1561,7 +1561,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2DOS, + GID_SIMON2, 0 }, @@ -1585,7 +1585,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2DOS, + GID_SIMON2, 0 }, @@ -1609,7 +1609,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2DOS, + GID_SIMON2, 0 }, @@ -1633,7 +1633,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1657,7 +1657,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1681,7 +1681,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1705,7 +1705,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1729,7 +1729,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1753,7 +1753,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1777,7 +1777,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1801,7 +1801,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1826,7 +1826,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1850,7 +1850,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1874,7 +1874,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1898,7 +1898,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1922,7 +1922,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1946,7 +1946,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, @@ -1970,7 +1970,7 @@ static const AGOSGameDescription gameDescriptions[] = { }, GType_SIMON2, - GID_SIMON2TALKIE, + GID_SIMON2, GF_TALKIE }, diff --git a/engines/agos/intern.h b/engines/agos/intern.h index 4479e2851e..c0c1e01417 100644 --- a/engines/agos/intern.h +++ b/engines/agos/intern.h @@ -258,14 +258,11 @@ enum GameIds { GID_ELVIRA2, GID_WAXWORKS, + GID_SIMON1, GID_SIMON1DOS, - GID_SIMON1ACORN, - GID_SIMON1AMIGA, GID_SIMON1CD32, - GID_SIMON1TALKIE, - GID_SIMON2DOS, - GID_SIMON2TALKIE, + GID_SIMON2, GID_FEEBLEFILES, diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp index ccd135e2ff..bbc9d2d4e0 100644 --- a/engines/agos/res_snd.cpp +++ b/engines/agos/res_snd.cpp @@ -235,9 +235,7 @@ void AGOSEngine_Simon1::playMusic(uint16 music, uint16 track) { if (AudioCD.isPlaying()) return; - if (getGameId() == GID_SIMON1ACORN) { - // TODO: Add support for Desktop Tracker format - } else if (getPlatform() == Common::kPlatformAmiga) { + if (getPlatform() == Common::kPlatformAmiga) { playModule(music); } else if (getFeatures() & GF_TALKIE) { char buf[4]; @@ -262,6 +260,8 @@ void AGOSEngine_Simon1::playMusic(uint16 music, uint16 track) { _midi.startTrack(0); _midi.startTrack(track); + } else if (getPlatform() == Common::kPlatformAcorn) { + // TODO: Add support for Desktop Tracker format in Acorn disk version } else { char filename[15]; File f; |