diff options
| author | Travis Howell | 2002-11-23 16:08:38 +0000 |
|---|---|---|
| committer | Travis Howell | 2002-11-23 16:08:38 +0000 |
| commit | 6ed12bc6aa0ddfc0da14e5e082656204986c7fc8 (patch) | |
| tree | 2c5a0e8cded44dfdc15a8a02659e53df0e06e2b5 | |
| parent | d574313f3285e43eff0c9e4ec0c879428fca8fd6 (diff) | |
| download | scummvm-rg350-6ed12bc6aa0ddfc0da14e5e082656204986c7fc8.tar.gz scummvm-rg350-6ed12bc6aa0ddfc0da14e5e082656204986c7fc8.tar.bz2 scummvm-rg350-6ed12bc6aa0ddfc0da14e5e082656204986c7fc8.zip | |
Simon stuff
svn-id: r5700
| -rw-r--r-- | common/gameDetector.cpp | 4 | ||||
| -rw-r--r-- | simon/simon.cpp | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index 9195ef2c67..8dd4d6a318 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -505,9 +505,9 @@ 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, "SIMON.GME"}, + {"simon1talkie", "Simon the Sorcerer 1 Talkie for DOS", GID_SIMON_FIRST+4, 99, 99, 99, 0, "GAMEPC"}, {"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, "SIMON.GME"}, + {"simon1win", "Simon the Sorcerer 1 Talkie for Windows", GID_SIMON_FIRST+6, 99, 99, 99, 0, "GAMEPC"}, {"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/simon.cpp b/simon/simon.cpp index 8cd21ad08d..30ced3b5bd 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -4554,7 +4554,12 @@ void SimonState::go() _mainscript_toggle = false; _vgascript_toggle = false; - _vk_t_toggle = false; + + if (_voice_type != FORMAT_NONE) { + _vk_t_toggle = false; + } else { + _vk_t_toggle = true; + } while (1) { hitarea_stuff(); |