aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamieson Christian2002-10-13 08:15:15 +0000
committerJamieson Christian2002-10-13 08:15:15 +0000
commit2255b212ed0cd5615826170358b771ddd019d979 (patch)
tree6e970778f9207228cd45d74f8a02983df9ed37be
parentbe120d3a3435c0d86e386fd7864689501bbc6146 (diff)
downloadscummvm-rg350-2255b212ed0cd5615826170358b771ddd019d979.tar.gz
scummvm-rg350-2255b212ed0cd5615826170358b771ddd019d979.tar.bz2
scummvm-rg350-2255b212ed0cd5615826170358b771ddd019d979.zip
Fixed GM part allocation conflicts, default Sam & Max pitch bend range
svn-id: r5136
-rw-r--r--scumm/imuse.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index df0695f43e..17f4dd08f9 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -3270,7 +3270,7 @@ void Part::setup(Player *player)
_transpose = 0;
_detune = 0;
_detune_eff = player->_detune;
- _pitchbend_factor = 2;
+ _pitchbend_factor = ((g_scumm->_features & GID_SAMNMAX) ? 2 : 12);
_pitchbend = 0;
_effect_level = 64;
_program = 255;
@@ -3297,6 +3297,8 @@ void Part::uninit()
_player = NULL;
_next = NULL;
_prev = NULL;
+
+ update_pris(); // In case another player couldn't allocate all its parts
}
void Part::off()