diff options
| -rw-r--r-- | common/gameDetector.cpp | 4 | ||||
| -rw-r--r-- | simon/items.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index 8db0906954..2554323068 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -146,10 +146,10 @@ const VersionSettings version_settings[] = { /* Simon the Sorcerer 1 & 2 (not SCUMM games) */ {"simon1dos", "Simon the Sorcerer 1 for DOS", GID_SIMON_FIRST+0, 99, 99, 99, 0, "GAMEPC"}, {"simon2dos", "Simon the Sorcerer 2 for DOS", GID_SIMON_FIRST+1, 99, 99, 99, 0, "GAME32"}, - {"simon1talkie", "Simon the Sorcerer 1 Talkie for DOS", GID_SIMON_FIRST+4, 99, 99, 99, 0, "SIMON1.GME"}, + {"simon1talkie", "Simon the Sorcerer 1 Talkie for DOS", GID_SIMON_FIRST+4, 99, 99, 99, 0, "SIMON.GME"}, {"simon2talkie", "Simon the Sorcerer 2 Talkie for DOS", GID_SIMON_FIRST+5, 99, 99, 99, 0, "GSPTR30"}, {"simon2talkie", "Simon the Sorcerer 2 Talkie for DOS", GID_SIMON_FIRST+5, 99, 99, 99, 0, "GSPTR30."}, - {"simon1win", "Simon the Sorcerer 1 Talkie for Windows", GID_SIMON_FIRST+6, 99, 99, 99, 0, "SIMON1.GME"}, + {"simon1win", "Simon the Sorcerer 1 Talkie for Windows", GID_SIMON_FIRST+6, 99, 99, 99, 0, "SIMON.GME"}, {"simon2win", "Simon the Sorcerer 2 Talkie for Windows", GID_SIMON_FIRST+7, 99, 99, 99, 0, "GSPTR30"}, {"simon2win", "Simon the Sorcerer 2 Talkie for Windows", GID_SIMON_FIRST+7, 99, 99, 99, 0, "GSPTR30."}, {"simon1demo", "Simon the Sorcerer 1 for DOS (Demo)", GID_SIMON_FIRST+8, 99, 99, 99, 0, "GDEMO"}, diff --git a/simon/items.cpp b/simon/items.cpp index 8f7205c1cd..3143d0d2e2 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -1488,8 +1488,7 @@ void SimonState::o_unk_127() uint a = getVarOrWord(); /*uint b = */ getVarOrWord(); - //FIXME simon 1 attempts repeat music track 35 in ending sequences when it should only be played once - if ((a != _last_music_played) && (a < 35)) { + if (a != _last_music_played) { _last_music_played = a; playMusic(a); } |