[Scummvm-cvs-logs] CVS: scummvm/scumm/smush insane.cpp,1.4,1.5 insane.h,1.3,1.4 smush_player.cpp,1.68,1.69

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv25306

Modified Files:
	insane.cpp insane.h smush_player.cpp 
Log Message:
Now Ben is visible, but kicking animation because of some bug is not visible
at speed = +3.

To reach first insane scene press ESC during non-interactive scene to skip
seek error.


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- insane.cpp	8 Dec 2003 08:47:21 -0000	1.4
+++ insane.cpp	8 Dec 2003 23:21:03 -0000	1.5
@@ -141,7 +141,7 @@
 	_idx2Exceeded = 0;
 	_memoryAllocatedNotOK = 0;
 	_lastKey = 0;
-	_tearsRustle = false;
+	_tiresRustle = false;
 	_keybOldDx = 0;
 	_keybOldDy = 0;
 	_velocityX = 0;
@@ -150,9 +150,8 @@
 	_keybY = 0;
 	_firstBattle = false;
[...1064 lines suppressed...]
@@ -4676,8 +4678,8 @@
 }
 
 int32 Insane::calcDamage(bool arg_0, bool arg_4) {
-	if ((_actor[1].x-_actor[0].x > weaponMaxRange(0)) ||
-		(_actor[1].x-_actor[0].x < weaponMinRange(0)))
+	if ((_actor[1].x - _actor[0].x > weaponMaxRange(0)) ||
+		(_actor[1].x - _actor[0].x < weaponMinRange(0)))
 		return 0;
 
 	if (_actor[1].field_44 && arg_4)
@@ -5182,6 +5184,8 @@
 			tmp = func60();
 	}
 
+	debug(1, "11:%d 12:%d 13:%d 10:%d", _actor[1].act[1].state, 
+				_actor[1].act[2].state, _actor[1].act[3].state, _actor[1].act[0].state);
 	proc59(1, 1, tmp);
 	proc51(1, 2, tmp);
 	proc54(1, 3, tmp);

Index: insane.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- insane.h	8 Dec 2003 08:47:21 -0000	1.3
+++ insane.h	8 Dec 2003 23:21:04 -0000	1.4
@@ -107,7 +107,7 @@
 	bool _memoryAllocatedNotOK;
 	int32 _lastKey;
 	bool _beenCheated;
-	bool _tearsRustle;
+	bool _tiresRustle;
 	int _keybOldDx;
 	int _keybOldDy;
 	int _velocityX;
@@ -115,12 +115,13 @@
 	int _keybX;
 	int _keybY;
 	int32 _firstBattle;
+	bool _weaponJustSwitched;
+	bool _kickingInProgress;
 	int32 _val8d;
 	byte _val10b;
 	int32 _val11d;
-	int32 _val20d;
 	int32 _val32d;
-	int32 _val39d;
+	int32 _val39_;
 	int32 _val50d;
 	int32 _val51d;
 	int32 _val52d;
@@ -143,9 +144,7 @@
 	bool _val122_;
 	bool _val123_;
 	bool _val124_;
-	bool _val127_;
 	int32 _val128d;
-	bool _val129_;
 	byte _val130b;
 	int16 _val131w;
 	int16 _val132w;
@@ -302,7 +301,7 @@
 		int32 field_34;
 		int32 field_38;
 		bool  lost;
-		bool  field_40;
+		bool  kicking;
 		bool  field_44;
 		int32 field_48;
 		int32 field_4C;
@@ -443,14 +442,14 @@
 							const char *filenamePtr, int startFrame, int numFrames);
 	int32 func10(bool flag);
 	void func11(int32 arg_0);
-	void actor1Reaction(int32 arg_4);
-	void actor2Reaction(int32 arg_4);
-	void actor3Reaction(int32 arg_4);
-	void actor8Reaction(int32 arg_4);
+	void actor02Reaction(int32 arg_4);
+	void actor00Reaction(int32 arg_4);
+	void actor01Reaction(int32 arg_4);
+	void actor03Reaction(int32 arg_4);
 	void checkEnemyLoose(int);
 	int32 processBattle(void);
-	void proc12(int arg_0);
-	void setEnemyAnimation(int32 actornum, int32 arg_4);
+	void chooseWeaponAnim(int arg_0);
+	void setEnemyAnimation(int32 actornum, int arg_4);
 	int speedTranslator(int value);
 	bool smush_eitherNotStartNewFrame(void);
 	void smlayer_setActorFacing(int actornum, int actnum, int frame, int direction);
@@ -461,7 +460,7 @@
 	int32 calcDamage(bool arg_0, bool arg_4);
 	int32 weaponDamage(int32 actornum);
 	void proc47(int32 actornum, int32 val);
-	int32 func48(void);
+	bool weaponEffective(void);
 	bool actor1StateFlags(int state);
 	bool actor0StateFlags1(int state);
 	bool actor0StateFlags2(int state);

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- smush_player.cpp	8 Dec 2003 04:16:41 -0000	1.68
+++ smush_player.cpp	8 Dec 2003 23:21:04 -0000	1.69
@@ -1026,6 +1026,9 @@
 			_scumm->_system->update_screen();
 			_updateNeeded = false;
 
+			if (_insanity)
+				_scumm->_sound->processSoundQues();
+
 			end_time = _scumm->_system->get_msecs();
 
 			debug(4, "Smush stats: BackendUpdateScreen( %03d )", end_time - start_time);