[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.19.2.2,1.19.2.3 insane_ben.cpp,1.10,1.10.2.1

[Eugene Sandulenko]

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

Modified Files:
      Tag: branch-0-6-0
	insane.cpp insane_ben.cpp 
Log Message:
Backport fix for INSANE battle difficulty


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.19.2.2
retrieving revision 1.19.2.3
diff -u -d -r1.19.2.2 -r1.19.2.3
--- insane.cpp	2 May 2004 16:36:04 -0000	1.19.2.2
+++ insane.cpp	23 Jun 2004 03:24:55 -0000	1.19.2.3
@@ -1070,12 +1070,12 @@
 
 bool Insane::actor0StateFlags1(int state) {
 	const int spans[] = {0, 2, 34, 35, 39, 69, 98, 100, 117};
-	bool retvalue = 0;
+	bool retvalue = 1;
 	unsigned int i;
 	
 	for (i = 0; i < sizeof(spans); i++) {
 		retvalue = !retvalue;
-		if (spans[i] <= state)
+		if (spans[i] >= state)
 			break;
 	}
 	return retvalue;
@@ -1090,12 +1090,12 @@
 		 593, 601, 604, 629, 634, 680, 682, 685, 688, 689, 693, 695, 712,
 		 716, 718, 748, 753, 787, 788, 804, 807, 808, 812, 814, 831, 863,
 		 866, 867, 872, 920, 922, 923, 926, 927, 931, 933, 950};
-	bool retvalue = 0;
+	bool retvalue = 1;
 	unsigned int i;
 	
 	for (i = 0; i < sizeof(spans); i++) {
 		retvalue = !retvalue;
-		if (spans[i] <= state)
+		if (spans[i] >= state)
 			break;
 	}
 	return retvalue;

Index: insane_ben.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_ben.cpp,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- insane_ben.cpp	10 Feb 2004 04:02:34 -0000	1.10
+++ insane_ben.cpp	23 Jun 2004 03:24:55 -0000	1.10.2.1
@@ -1795,7 +1795,7 @@
 void Insane::chooseBenWeaponAnim(int buttons) {
 	// kick
 	if ((buttons & 1) && (_currEnemy != EN_TORQUE)) {
-		if (!_kickBenProgress && actor0StateFlags2(_actor[0].act[2].state + _actor[0].weapon * 238)) {
+		if (!_kickBenProgress && actor0StateFlags2(_actor[0].act[2].state + _actor[0].weapon * 119)) {
 			switch (_actor[0].weapon) {
 			case INV_CHAIN:
 				_actor[0].act[2].state = 10;