[Scummvm-cvs-logs] scummvm master -> 880f2641502c3c946bc1b619a13f704007f791f5

sev- sev at scummvm.org
Sat Mar 30 16:11:43 CET 2013


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

Summary:
880f264150 SCUMM: Fix more bugs in INSANE


Commit: 880f2641502c3c946bc1b619a13f704007f791f5
    https://github.com/scummvm/scummvm/commit/880f2641502c3c946bc1b619a13f704007f791f5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-03-30T08:10:30-07:00

Commit Message:
SCUMM: Fix more bugs in INSANE

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



diff --git a/engines/scumm/insane/insane_ben.cpp b/engines/scumm/insane/insane_ben.cpp
index 48aaab5..e88a1d3 100644
--- a/engines/scumm/insane/insane_ben.cpp
+++ b/engines/scumm/insane/insane_ben.cpp
@@ -634,7 +634,7 @@ void Insane::actor02Reaction(int32 buttons) {
 		_actor[0].newFacingFlag = 1;
 		_actor[0].kicking = false;
 		if ((_actor[0].act[2].frame == 3) && (calcEnemyDamage(0, 0) == 1)) {
-			_actor[1].damage = weaponDamage(0);
+			_actor[1].damage += weaponDamage(0);
 			smlayer_startSfx(64);
 			_actor[1].cursorX = 320;
 		}
@@ -805,7 +805,7 @@ void Insane::actor02Reaction(int32 buttons) {
 				if ((_actor[1].x - _actor[0].x <= weaponMaxRange(0)) &&
 					(_actor[1].x - _actor[0].x >= weaponMinRange(0))) {
 					smlayer_startSfx(76);
-					_actor[1].damage = weaponDamage(0);
+					_actor[1].damage += weaponDamage(0);
 				}
 				break;
 			default:
@@ -813,7 +813,7 @@ void Insane::actor02Reaction(int32 buttons) {
 					smlayer_startSfx(76);
 				break;
 			}
-			smlayer_setActorFacing(0, 2, 21,180);
+			smlayer_setActorFacing(0, 2, 21, 180);
 			_actor[0].act[2].state = 17;
 		}
 		_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);






More information about the Scummvm-git-logs mailing list