libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-20 08:53:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

o Fix for bug #889751. Bump sound on the highway keeps playing

Browse Source 
o Fix for bug #888639. Mine road female biker loop

svn-id: r12743
This commit is contained in:
Eugene Sandulenko 2004-02-05 19:26:00 +00:00
parent 6a6d69254d
commit f98cc6f02e
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scumm/insane/insane_enemy.cpp
View File

@ -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;
}

4
scumm/insane/insane_scenes.cpp
View File

@ -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);
}