diff options
| -rw-r--r-- | scumm/insane/insane_enemy.cpp | 11 | ||||
| -rw-r--r-- | scumm/insane/insane_scenes.cpp | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/scumm/insane/insane_enemy.cpp b/scumm/insane/insane_enemy.cpp index a119bda29b..2bf397f1b2 100644 --- a/scumm/insane/insane_enemy.cpp +++ b/scumm/insane/insane_enemy.cpp @@ -330,7 +330,7 @@ int32 Insane::enemy1handler(int32 actor1, int32 actor2, int32 probability) { retval = 1; } if (_actor[actor2].kicking) { - if (weaponMaxRange(actor2) >= dist) + if (weaponMaxRange(actor2) <= dist) if (rand() % (probability * 2) <= 1) retval = 1; } @@ -2519,13 +2519,8 @@ void Insane::actor12Reaction(int32 buttons) { smlayer_setActorLayer(1, 2, 25); _actor[1].kicking = false; - if (_actor[1].act[2].frame >= 16) { - if (_actor[1].x >= 50 && _actor[1].x <= 270) - break; - - if (_actor[1].act[2].frame < 8) - break; - + if (_actor[1].act[2].frame >= 16 || ((_actor[1].x < 50 || _actor[1].x > 270) + && (_actor[1].act[2].frame >= 8))) { queueSceneSwitch(11, 0, _enemy[_currEnemy].filename, 64, 0, 0, 0); _actor[1].act[2].state = 38; } diff --git a/scumm/insane/insane_scenes.cpp b/scumm/insane/insane_scenes.cpp index daa15be229..546e123169 100644 --- a/scumm/insane/insane_scenes.cpp +++ b/scumm/insane/insane_scenes.cpp @@ -1122,7 +1122,7 @@ void Insane::postCase3(byte *renderBitmap, int32 codecparam, int32 setupsan12, if (!smlayer_isSoundRunning(86)) smlayer_startSfx(86); } else { - if (!smlayer_isSoundRunning(86)) + if (smlayer_isSoundRunning(86)) smlayer_stopSound(86); } @@ -1166,7 +1166,7 @@ void Insane::postCase5(byte *renderBitmap, int32 codecparam, int32 setupsan12, if (!smlayer_isSoundRunning(86)) smlayer_startSfx(86); } else { - if (!smlayer_isSoundRunning(86)) + if (smlayer_isSoundRunning(86)) smlayer_stopSound(86); } |