diff --git a/actor.cpp b/actor.cpp index 42b8d4f0715..cd11d3396b2 100644 --- a/actor.cpp +++ b/actor.cpp @@ -918,6 +918,9 @@ void Scumm::drawActorCostume(Actor * a) a->mask = 0; else if (g_scumm->getClass(a->number, 21)) a->forceClip = 1; + + if (_gameId==GID_SAMNMAX && getState(995)) // FIXME: ugly fix for samnmax inventory + return; a->needRedraw = false; diff --git a/sound/imuse.cpp b/sound/imuse.cpp index be566d41225..4eb84662cda 100644 --- a/sound/imuse.cpp +++ b/sound/imuse.cpp @@ -1354,16 +1354,24 @@ int32 IMuse::do_command(int a, int b, int c, int d, int e, int f, int g, return start_sound(b) ? 0 : -1; case 9: return stop_sound(b); + case 10: + return stop_all_sounds(); //FIXME case 11: return stop_all_sounds(); case 13: return get_sound_status(b); + case 14: + return stop_sound(b); //FIXME should be something like fade off case 16: return set_volchan(b, c); case 17: return set_channel_volume(b, c); case 18: return set_volchan_entry(b, c); + case 19: + return stop_sound(b); //FIXME + case 20: + return stop_sound(b); //FIXME case 2: case 3: