diff options
| author | Travis Howell | 2003-01-04 08:46:10 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-01-04 08:46:10 +0000 |
| commit | b989a3a934892c83f99a9391872e7b5727d49450 (patch) | |
| tree | 836658b3949accf226a3fdb97b8cad8aafe3d687 /simon | |
| parent | 5111eede5e768c9f0edde184c4bbc87ba3bc8463 (diff) | |
| download | scummvm-rg350-b989a3a934892c83f99a9391872e7b5727d49450.tar.gz scummvm-rg350-b989a3a934892c83f99a9391872e7b5727d49450.tar.bz2 scummvm-rg350-b989a3a934892c83f99a9391872e7b5727d49450.zip | |
Fix crashes in simon2dos/talkie caused by my music changes awhile back.
svn-id: r6328
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/items.cpp | 6 | ||||
| -rw-r--r-- | simon/vga.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index 8cd5ff67df..fcdd416c57 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -1491,8 +1491,10 @@ void SimonState::o_unk_127() _vc70_var1 = 0xffff; _vc72_var3 = 0xffff; _midi_unk2 = 0xffff; - midi.initialize(); - midi.play(); + if (_game & GAME_WIN) { + midi.initialize(); + midi.play(); + } _vc72_var1 = b; } else { _vc72_var3 = b; diff --git a/simon/vga.cpp b/simon/vga.cpp index 50a7d56406..8ade7bf6fc 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1905,8 +1905,10 @@ void SimonState::vc_69() if (_vc72_var1 == 999) { _vc70_var2 = b; - midi.initialize(); - midi.play(); + if (_game & GAME_WIN) { + midi.initialize(); + midi.play(); + } _vc72_var1 = b; } else if (_vc72_var1 != 0xFFFF) { if (_vc72_var1 != a) { |