diff options
| author | Travis Howell | 2003-08-02 11:04:29 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-02 11:04:29 +0000 |
| commit | 8762b47a11dd564543429dfb9940982e4e9e8e5a (patch) | |
| tree | 4eba1517f5a34a6789b940dd94d2c33048ed06c2 /simon | |
| parent | 03f6ec8a8a3f26167c52819f8f7a2089071734da (diff) | |
| download | scummvm-rg350-8762b47a11dd564543429dfb9940982e4e9e8e5a.tar.gz scummvm-rg350-8762b47a11dd564543429dfb9940982e4e9e8e5a.tar.bz2 scummvm-rg350-8762b47a11dd564543429dfb9940982e4e9e8e5a.zip | |
Make code match
svn-id: r9405
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 4a0c613a59..b2f2c3774c 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -3818,7 +3818,7 @@ void SimonEngine::talk_with_speech(uint speech_id, uint num_1) { if (speech_id == 0xFFFF) { if (_subtitles) return; - if (!(_bit_array[0] & 0x4000 || _bit_array[1] & 0x1000)) { + if (!(_bit_array[0] & 0x4000) && !(_bit_array[1] & 0x1000)) { _bit_array[0] |= 0x4000; _variableArray[100] = 5; start_vga_code(4, 1, 0x1e, 0, 0, 0); @@ -3828,7 +3828,7 @@ void SimonEngine::talk_with_speech(uint speech_id, uint num_1) { } else { if (_subtitles && _scriptvar_2) { start_vga_code(4, 2, 5, 0, 0, 0); - o_wait_for_vga(0xcd); + o_wait_for_vga(205); o_kill_sprite_simon2(2, 5); } o_kill_sprite_simon2(2, num_1 + 2); |