aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2012-11-12 22:10:10 +0100
committerTorbjörn Andersson2012-11-12 22:10:10 +0100
commit107a1af125cc77082cc205fcfa1b86c7509c26c5 (patch)
tree1aab15231e2336eed9e4ce95eba35f69ccf77e91
parent8bb595453b7bce6e219acc94c105a1f76e5ff734 (diff)
downloadscummvm-rg350-107a1af125cc77082cc205fcfa1b86c7509c26c5.tar.gz
scummvm-rg350-107a1af125cc77082cc205fcfa1b86c7509c26c5.tar.bz2
scummvm-rg350-107a1af125cc77082cc205fcfa1b86c7509c26c5.zip
SCUMM: Initialize the Macintosh MI1 instruments, along with the channels.
Otherwise it may crash if you quit before any instruments have been loaded. Oops.
-rw-r--r--engines/scumm/player_v5m.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/scumm/player_v5m.cpp b/engines/scumm/player_v5m.cpp
index 2ad0d10b50..640361cb61 100644
--- a/engines/scumm/player_v5m.cpp
+++ b/engines/scumm/player_v5m.cpp
@@ -104,6 +104,14 @@ Player_V5M::Player_V5M(ScummEngine *scumm, Audio::Mixer *mixer)
_channel[i]._velocity = 0;
_channel[i]._remaining = 0;
_channel[i]._notesLeft = false;
+ _channel[i]._instrument._data = NULL;
+ _channel[i]._instrument._size = 0;
+ _channel[i]._instrument._rate = 0;
+ _channel[i]._instrument._loopStart = 0;
+ _channel[i]._instrument._loopEnd = 0;
+ _channel[i]._instrument._baseFreq = 0;
+ _channel[i]._instrument._pos = 0;
+ _channel[i]._instrument._subPos = 0;
}
_pitchTable[116] = 1664510;