[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.62,1.63 insane.h,1.20,1.21 insane_ben.cpp,1.27,1.28 insane_scenes.cpp,1.31,1.32

[Gregory Montoir]

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

Modified Files:
	insane.cpp insane.h insane_ben.cpp insane_scenes.cpp 
Log Message:
rename some actor struct fields

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- insane.cpp	30 Jul 2005 21:11:32 -0000	1.62
+++ insane.cpp	11 Aug 2005 18:09:47 -0000	1.63
@@ -373,8 +373,8 @@
 	_actor[0].x1 = -1;
 	_actor[0].weaponClass = 2;
 	_actor[0].animWeaponClass = 0;
-	_actor[0].field_34 = 2;
-	_actor[0].field_38 = 0;
+	_actor[0].newFacingFlag = 2;
+	_actor[0].curFacingFlag = 0;
 	_actor[0].lost = false;
 	_actor[0].kicking = false;
 	_actor[0].field_44 = false;
@@ -412,8 +412,8 @@
 	_actor[1].x1 = -1;
 	_actor[1].weaponClass = 2;
 	_actor[1].animWeaponClass = 0;
-	_actor[1].field_34 = 0;
-	_actor[1].field_38 = 0;
+	_actor[1].newFacingFlag = 0;
+	_actor[1].curFacingFlag = 0;
 	_actor[1].lost = false;
 	_actor[1].kicking = false;
 	_actor[1].field_44 = false;
@@ -914,8 +914,8 @@
 	_actor[0].weapon = INV_HAND;
 	_actor[0].weaponClass = 2;
 	_actor[0].animWeaponClass = 0;
-	_actor[0].field_34 = 2;
-	_actor[0].field_38 = 0;
+	_actor[0].newFacingFlag = 2;
+	_actor[0].curFacingFlag = 0;
 	_actor[0].tilt = 0;
 	_actor[0].field_8 = 1;
 	_actor[0].act[2].state = 1;

Index: insane.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- insane.h	30 Jul 2005 21:11:33 -0000	1.20
+++ insane.h	11 Aug 2005 18:09:47 -0000	1.21
@@ -243,13 +243,13 @@
 		int32 x1;
 		int16 weaponClass;
 		int16 animWeaponClass;
-		int16 field_34;
-		int16 field_38;
-		bool  lost;
-		bool  kicking;
-		bool  field_44;
-		bool field_48;
-		bool  defunct;
+		int16 newFacingFlag;
+		int16 curFacingFlag;
+		bool lost;
+		bool kicking;
+		bool field_44;
+		bool field_48; // unused
+		bool defunct;
 		int32 scenePropSubIdx;
 		int32 field_54;
 		int32 runningSound;

Index: insane_ben.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_ben.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- insane_ben.cpp	30 Jul 2005 21:11:33 -0000	1.27
+++ insane_ben.cpp	11 Aug 2005 18:09:47 -0000	1.28
@@ -607,7 +607,7 @@
 	case 6:
 		smlayer_setActorLayer(0, 2, 4);
 		_actor[0].weaponClass = 2;
-		_actor[0].field_34 = 1;
+		_actor[0].newFacingFlag = 1;
 		_actor[0].kicking = false;
 		smlayer_setActorCostume(0, 2, readArray(22));
 		smlayer_setActorFacing(0, 2, 19, 180);
@@ -618,7 +618,7 @@
 	case 7:
 		smlayer_setActorLayer(0, 2, 4);
 		_actor[0].weaponClass = 2;
-		_actor[0].field_34 = 1;
+		_actor[0].newFacingFlag = 1;
 		_actor[0].kicking = false;
 		if (_actor[0].act[2].frame >= 1) {
 			smlayer_setActorFacing(0, 2, 20, 180);
@@ -629,7 +629,7 @@
 	case 8:
 		smlayer_setActorLayer(0, 2, 4);
 		_actor[0].weaponClass = 2;
-		_actor[0].field_34 = 1;
+		_actor[0].newFacingFlag = 1;
 		_actor[0].kicking = false;
 		if ((_actor[0].act[2].frame == 3) && (calcEnemyDamage(0, 0) == 1)) {
 			_actor[1].damage = weaponDamage(0);
@@ -645,11 +645,11 @@
 	case 9:
 		smlayer_setActorLayer(0, 2, 5);
 		_actor[0].weaponClass = 2;
-		_actor[0].field_34 = 1;
+		_actor[0].newFacingFlag = 1;
 		_actor[0].kicking = false;
 		if (_actor[0].act[2].frame >= 3) {
 			smlayer_setActorCostume(0, 2, readArray(12));
-			_actor[0].field_34 = 2;
+			_actor[0].newFacingFlag = 2;
 			_actor[0].act[2].state = 1;
 		}
 		_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
@@ -1715,8 +1715,8 @@
 		break;
 	}
 
-	if (_actor[0].field_38 != _actor[0].field_34) {
-		if (_actor[0].field_34 == 2)
+	if (_actor[0].curFacingFlag != _actor[0].newFacingFlag) {
+		if (_actor[0].newFacingFlag == 2)
 			smlayer_setActorFacing(0, 1, 28, 180);
 		else
 			smlayer_setActorFacing(0, 1, 27, 180);
@@ -1731,7 +1731,7 @@
 		smlayer_putActor(0, 1, tmpx, tmpy, _smlayer_room);
 
 	_actor[0].animWeaponClass = _actor[0].weaponClass;
-	_actor[0].field_38 = _actor[0].field_34;
+	_actor[0].curFacingFlag = _actor[0].newFacingFlag;
 }
 
 void Insane::actor03Reaction(int32 buttons) {

Index: insane_scenes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_scenes.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- insane_scenes.cpp	30 Jul 2005 21:11:33 -0000	1.31
+++ insane_scenes.cpp	11 Aug 2005 18:09:47 -0000	1.32
@@ -765,8 +765,8 @@
 	_actor[0].weapon = INV_HAND;
 	_actor[0].weaponClass = 2;
 	_actor[0].animWeaponClass = 0;
-	_actor[0].field_34 = 2;
-	_actor[0].field_38 = 0;
+	_actor[0].newFacingFlag = 2;
+	_actor[0].curFacingFlag = 0;
 	_actor[0].tilt = 0;
 	_actor[0].field_8 = 1;
 	_actor[0].act[2].state = 1;