[Scummvm-cvs-logs] scummvm master -> a36a7253e479d823a5e93104a166a6198663a3c2

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9479d1a9ee SCUMM: Fix bug #3546434: "SCUMM: FT glitches in Vulture encounter on old mine road"
a36a7253e4 SCUMM: Fix several bugs in INSANE


Commit: 9479d1a9ee0b17302410af5a54f5942ff864ceec
    https://github.com/scummvm/scummvm/commit/9479d1a9ee0b17302410af5a54f5942ff864ceec
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-03-30T06:53:44-07:00

Commit Message:
SCUMM: Fix bug #3546434: "SCUMM: FT glitches in Vulture encounter on old mine road"

There was a missing Sfx call.

Changed paths:
    engines/scumm/insane/insane_enemy.cpp



diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp
index 913f761..f416601 100644
--- a/engines/scumm/insane/insane_enemy.cpp
+++ b/engines/scumm/insane/insane_enemy.cpp
@@ -2343,6 +2343,7 @@ void Insane::actor12Reaction(int32 buttons) {
 		_actor[1].kicking = false;
 		break;
 	case 92:
+	case 96:
 		smlayer_setActorLayer(1, 2, 5);
 		_actor[1].kicking = false;
 		break;
@@ -2353,6 +2354,7 @@ void Insane::actor12Reaction(int32 buttons) {
 		smlayer_setActorFacing(1, 2, 18, 180);
 		_actor[1].act[2].state = 94;
 		_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
+		smlayer_startSfx(102);
 		break;
 	case 94:
 		smlayer_setActorLayer(1, 2, 4);


Commit: a36a7253e479d823a5e93104a166a6198663a3c2
    https://github.com/scummvm/scummvm/commit/a36a7253e479d823a5e93104a166a6198663a3c2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-03-30T06:53:44-07:00

Commit Message:
SCUMM: Fix several bugs in INSANE

Changed paths:
    engines/scumm/insane/insane_enemy.cpp



diff --git a/engines/scumm/insane/insane_enemy.cpp b/engines/scumm/insane/insane_enemy.cpp
index f416601..4e66b27 100644
--- a/engines/scumm/insane/insane_enemy.cpp
+++ b/engines/scumm/insane/insane_enemy.cpp
@@ -1892,6 +1892,7 @@ void Insane::actor12Reaction(int32 buttons) {
 				break;
 			}
 		}
+		_actor[1].kicking = true;
 		_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
 		break;
 	case 20:
@@ -1932,6 +1933,7 @@ void Insane::actor12Reaction(int32 buttons) {
 		_actor[1].kicking = false;
 		if (_actor[1].act[2].frame >= 5) {
 			smlayer_setActorFacing(1, 2, 25, 180);
+			smlayer_setActorLayer(1, 2, 5);
 			_actor[1].act[2].state = 65;
 		}
 		_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
@@ -2012,7 +2014,6 @@ void Insane::actor12Reaction(int32 buttons) {
 			} else {
 				smlayer_setActorFacing(1, 2, 20, 180);
 				_actor[1].act[2].state = 28;
-				break;
 			}
 		}
 		_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
@@ -2063,10 +2064,8 @@ void Insane::actor12Reaction(int32 buttons) {
 		smlayer_setActorLayer(1, 2, 5);
 		_actor[1].kicking = false;
 
-		if (!smlayer_actorNeedRedraw(1, 2)) {
+		if (!smlayer_actorNeedRedraw(1, 2))
 			switchEnemyWeapon();
-			_actor[1].act[2].tilt = 0;
-		}
 		_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
 		break;
 	case 36:
@@ -2156,16 +2155,8 @@ void Insane::actor12Reaction(int32 buttons) {
 		_actor[1].kicking = false;
 		_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
 		break;
+	case 62:
 	case 65:
-		smlayer_setActorLayer(1, 2, 5);
-		if (_actor[1].act[2].animTilt) {
-			smlayer_setActorFacing(1, 2, 25, 180);
-			_actor[1].act[2].animTilt = 0;
-		}
-		_actor[1].weaponClass = 1;
-		_actor[1].kicking = false;
-		_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
-		break;
 	case 66:
 		smlayer_setActorLayer(1, 2, 5);
 		if (_actor[1].act[2].animTilt) {
@@ -2322,6 +2313,7 @@ void Insane::actor12Reaction(int32 buttons) {
 		smlayer_startSfx(100);
 		_actor[1].act[2].state = 90;
 		_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
+		smlayer_setActorLayer(1, 2, 26);
 		break;
 	case 90:
 		smlayer_setActorLayer(1, 2, 26);
@@ -2531,7 +2523,6 @@ void Insane::actor12Reaction(int32 buttons) {
 		_actor[1].act[0].room = 0;
 		_actor[1].cursorX = 0;
 		_actor[1].act[2].state = 116;
-		smlayer_startVoice(232);
 		break;
 	case 116:
 		smlayer_setActorLayer(1, 2, 25);