diff options
| author | Jamieson Christian | 2003-05-22 00:00:42 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-05-22 00:00:42 +0000 |
| commit | 3b08208879e8abfd138bae444668d288b5b2b89a (patch) | |
| tree | d45a3844b7ac0e46fd0e3569a3028d84d2a12bc1 /simon/items.cpp | |
| parent | b12d741ac118eabbdbe7e38383933e0337fc002a (diff) | |
| download | scummvm-rg350-3b08208879e8abfd138bae444668d288b5b2b89a.tar.gz scummvm-rg350-3b08208879e8abfd138bae444668d288b5b2b89a.tar.bz2 scummvm-rg350-3b08208879e8abfd138bae444668d288b5b2b89a.zip | |
Fixed premature music load in Simon 2
svn-id: r7812
Diffstat (limited to 'simon/items.cpp')
| -rw-r--r-- | simon/items.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/simon/items.cpp b/simon/items.cpp index d23dbe0333..f49196222e 100644 --- a/simon/items.cpp +++ b/simon/items.cpp @@ -1445,12 +1445,10 @@ void SimonState::o_play_music_resource() { int loop = getVarOrByte(); midi.setLoop (loop != 0); - if (_last_music_played != music) { - loadMusic (music); - _last_music_played = music; - _next_music_to_play = -1; - } - midi.startTrack (track); + if (_last_music_played != music) + _next_music_to_play = music; + else + midi.startTrack (track); } else { if (music != _last_music_played) { _last_music_played = music; |