[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane_enemy.cpp,1.7,1.8 insane_scenes.cpp,1.11,1.12

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm/insane
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2229/scumm/insane

Modified Files:
	insane_enemy.cpp insane_scenes.cpp 
Log Message:
o Fix for bug #889751. Bump sound on the highway keeps playing
o Fix for bug #888639. Mine road female biker loop


Index: insane_enemy.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_enemy.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- insane_enemy.cpp	1 Feb 2004 05:44:18 -0000	1.7
+++ insane_enemy.cpp	5 Feb 2004 19:26:00 -0000	1.8
@@ -330,7 +330,7 @@
 					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 @@
 		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;
 		}

Index: insane_scenes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_scenes.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- insane_scenes.cpp	2 Feb 2004 22:40:19 -0000	1.11
+++ insane_scenes.cpp	5 Feb 2004 19:26:00 -0000	1.12
@@ -1122,7 +1122,7 @@
 		if (!smlayer_isSoundRunning(86))
 			smlayer_startSfx(86);
 	} else {
-		if (!smlayer_isSoundRunning(86))
+		if (smlayer_isSoundRunning(86))
 			smlayer_stopSound(86);
 	}
 
@@ -1166,7 +1166,7 @@
 		if (!smlayer_isSoundRunning(86))
 			smlayer_startSfx(86);
 	} else {
-		if (!smlayer_isSoundRunning(86))
+		if (smlayer_isSoundRunning(86))
 			smlayer_stopSound(86);
 	}