[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.61,1.62 insane.h,1.19,1.20 insane_ben.cpp,1.26,1.27 insane_enemy.cpp,1.21,1.22 insane_iact.cpp,1.20,1.21 insane_scenes.cpp,1.30,1.31

Eugene Sandulenko sev at users.sourceforge.net
Sat Jul 30 14:14:56 CEST 2005 

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

Modified Files:
	insane.cpp insane.h insane_ben.cpp insane_enemy.cpp 
	insane_iact.cpp insane_scenes.cpp 
Log Message:
Remove trailing whitespaces.


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- insane.cpp	24 Jun 2005 15:23:22 -0000	1.61
+++ insane.cpp	30 Jul 2005 21:11:32 -0000	1.62
@@ -45,13 +45,13 @@
 
 namespace Scumm {
 
-static const int actorAnimationData[21] = {20, 21, 22, 23, 24, 25, 26, 13, 14, 15, 16, 17, 
+static const int actorAnimationData[21] = {20, 21, 22, 23, 24, 25, 26, 13, 14, 15, 16, 17,
 	18, 19, 6, 7, 8, 9, 10, 11, 12};
 
 
 Insane::Insane(ScummEngine_v6 *scumm) {
 	_vm = scumm;
-	
+
 	initvars();
 
 	if (!((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))) {
@@ -177,30 +177,30 @@
 	for (i = 0; i < 0x80; i++)
 		_iactBits[i] = 0;
 
-	
+
 	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
-		init_enemyStruct(EN_ROTT1, EN_ROTT1, 0, 0, 160, 0, INV_MACE, 63, "endcrshr.san", 
+		init_enemyStruct(EN_ROTT1, EN_ROTT1, 0, 0, 160, 0, INV_MACE, 63, "endcrshr.san",
 						 25, 15, 16, 26, 11, 3);
 	} else {
-		init_enemyStruct(EN_ROTT1, EN_ROTT1, 0, 0, 160, 0, INV_MACE, 90, "wr2_rott.san", 
+		init_enemyStruct(EN_ROTT1, EN_ROTT1, 0, 0, 160, 0, INV_MACE, 90, "wr2_rott.san",
 						 26, 16, 17, 27, 11, 3);
 	}
 
-	init_enemyStruct(EN_ROTT2, EN_ROTT2, 1, 0, 250, 0, INV_2X4, 90, "wr2_rott.san", 
+	init_enemyStruct(EN_ROTT2, EN_ROTT2, 1, 0, 250, 0, INV_2X4, 90, "wr2_rott.san",
 					 28, 16, 17, 42, 11, 3);
-	init_enemyStruct(EN_ROTT3, EN_ROTT3, 2, 0, 120, 0, INV_HAND, 90, "wr2_rott.san", 
+	init_enemyStruct(EN_ROTT3, EN_ROTT3, 2, 0, 120, 0, INV_HAND, 90, "wr2_rott.san",
 					 15, 16, 17, 43, 11, 3);
-	init_enemyStruct(EN_VULTF1, EN_VULTF1, 3, 0, 60, 0, INV_HAND, 91, "wr2_vltp.san", 
+	init_enemyStruct(EN_VULTF1, EN_VULTF1, 3, 0, 60, 0, INV_HAND, 91, "wr2_vltp.san",
 					 29, 33, 32, 37, 12, 4);
-	init_enemyStruct(EN_VULTM1, EN_VULTM1, 4, 0, 100, 0, INV_CHAIN, 91, "wr2_vltc.san", 
+	init_enemyStruct(EN_VULTM1, EN_VULTM1, 4, 0, 100, 0, INV_CHAIN, 91, "wr2_vltc.san",
 					 30, 33, 32, 36, 12, 4);
-	init_enemyStruct(EN_VULTF2, EN_VULTF2, 5, 0, 250, 0, INV_CHAINSAW, 91, "wr2_vlts.san", 
+	init_enemyStruct(EN_VULTF2, EN_VULTF2, 5, 0, 250, 0, INV_CHAINSAW, 91, "wr2_vlts.san",
 					 31, 33, 32, 35, 12, 4);
-	init_enemyStruct(EN_VULTM2, EN_VULTM2, 6, 0, 900, 0, INV_BOOT, 91, "wr2_rott.san", 
+	init_enemyStruct(EN_VULTM2, EN_VULTM2, 6, 0, 900, 0, INV_BOOT, 91, "wr2_rott.san",
 					 34, 33, 32, 45, 16, 4);
-	init_enemyStruct(EN_CAVEFISH, EN_CAVEFISH, 7, 0, 60, 0, INV_DUST, 92, "wr2_cave.san", 
+	init_enemyStruct(EN_CAVEFISH, EN_CAVEFISH, 7, 0, 60, 0, INV_DUST, 92, "wr2_cave.san",
 					 39, 0, 0, 41, 13, 2);
-	init_enemyStruct(EN_TORQUE, EN_TORQUE, 8, 0, 900, 0, INV_HAND, 93, "wr2_vltp.san", 
+	init_enemyStruct(EN_TORQUE, EN_TORQUE, 8, 0, 900, 0, INV_HAND, 93, "wr2_vltp.san",
 					 57, 0, 0, 37, 12, 1);
 
 	init_fluConfStruct(1, 1, &_smush_minedrivFlu, "minedriv.san", 235, 1300);
@@ -219,7 +219,7 @@
 	init_fluConfStruct(18, 4, &_smush_tovista1Flu, "tovista1.san", 175, 230);
 	init_fluConfStruct(19, 6, &_smush_toranchFlu, "toranch.san", 115, 530);
 	init_fluConfStruct(20, 6, &_smush_toranchFlu, "toranch.san", 115, 530);
-  
+
 	init_scenePropStruct(  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 1);
 	init_scenePropStruct(  1,  0, 1, 128, 2001, 0, 0, 0, 0, 56, 2);
 	init_scenePropStruct(  2,  0, 0, 125, 1002, 0, 0, 0, 0, 35, 3);
@@ -444,7 +444,7 @@
 			_enemyState[i][j] = 0;
 }
 
-void Insane::init_actStruct(int actornum, int actnum, int32 actorval, byte state, 
+void Insane::init_actStruct(int actornum, int actnum, int32 actorval, byte state,
 								  int32 room, int32 animTilt, int32 tilt, int32 frame) {
 	_actor[actornum].act[actnum].actor = actorval;
 	_actor[actornum].act[actnum].state = state;
@@ -477,7 +477,7 @@
 	_enemy[n].apprAnim = apprAnim;
 }
 
-void Insane::init_fluConfStruct(int n, int sceneId, byte **fluPtr, 
+void Insane::init_fluConfStruct(int n, int sceneId, byte **fluPtr,
 					const char *filenamePtr, int startFrame, int numFrames) {
 	_fluConf[n].sceneId = sceneId;
 	_fluConf[n].fluPtr = fluPtr;
@@ -502,7 +502,7 @@
 
 void Insane::setBenAnimation(int32 actornum, int anim) {
 	if (anim <= 12)
-		smlayer_setActorFacing(actornum, 1, 
+		smlayer_setActorFacing(actornum, 1,
 			  actorAnimationData[_actor[actornum].weaponClass * 7 + anim - 6], 180);
 }
 
@@ -513,7 +513,7 @@
 		d = 14;
 
 	if (anim <= 12)
-		smlayer_setActorFacing(actornum, 1, 
+		smlayer_setActorFacing(actornum, 1,
 			  actorAnimationData[_actor[actornum].weaponClass * 7 + anim - 6] + d, 180);
 }
 
@@ -598,7 +598,7 @@
 	in.read(*buf, len);
 }
 
-void Insane::startVideo(const char *filename, int num, int argC, int frameRate, 
+void Insane::startVideo(const char *filename, int num, int argC, int frameRate,
 						 int doMainLoop, byte *fluPtr, int32 startFrame) {
 	int32 offset = 0;
 
@@ -679,13 +679,13 @@
 		// Still it is unknown what leads to this state. Most probably it is memory
 		// overwrite
 		if (_enemy[EN_VULTM2].isEmpty != readArray(7)) {
-			warning("Wrong INSANE parameters for EN_VULTM2 (%d %d)", 
+			warning("Wrong INSANE parameters for EN_VULTM2 (%d %d)",
 				  _enemy[EN_VULTM2].isEmpty, readArray(7));
 			_enemy[EN_VULTM2].isEmpty = readArray(7);
 		}
 
 		if (_enemy[EN_VULTF2].isEmpty != (_actor[0].inventory[INV_CHAINSAW] != 0)) {
-			warning("Wrong INSANE parameters for EN_VULTF2 (%d %d)", 
+			warning("Wrong INSANE parameters for EN_VULTF2 (%d %d)",
 				  _enemy[EN_VULTF2].isEmpty, _actor[0].inventory[INV_CHAINSAW]);
 			_enemy[EN_VULTF2].isEmpty = (_actor[0].inventory[INV_CHAINSAW] != 0);
 		}
@@ -698,11 +698,11 @@
 		//  you won cavefish, don't have googles, don't have ramp
 		//
 		// So if you find out what how to check ramp presense, feel free to add check here
-		// (beware of FT ver a and ver b. In version b var311 is inserted and all vars >311 
+		// (beware of FT ver a and ver b. In version b var311 is inserted and all vars >311
 		// are shifted),
-		// 
+		//
 		//if (_enemy[EN_CAVEFISH].isEmpty != readArray(8))
-		//	error("Wrong INSANE parameters for EN_CAVEFISH (%d %d). Please, report this", 
+		//	error("Wrong INSANE parameters for EN_CAVEFISH (%d %d). Please, report this",
 		//		  _enemy[EN_CAVEFISH].isEmpty, readArray(8));
 	}
 }
@@ -738,7 +738,7 @@
 	_objArray1Idx++;
 	if (_objArray1Idx >= 100)
 		_objArray1Idx = 0;
-	
+
 	return _objArray1[_objArray1Idx];
 }
 
@@ -746,7 +746,7 @@
 	if (!_idx2Exceeded)
 		if (_objArray2Idx >= _objArray2Idx2)
 			return false;
-	
+
 	_objArray2Idx++;
 	if (_objArray2Idx >= 100) {
 		_idx2Exceeded = 0;
@@ -838,20 +838,20 @@
 	return _smush_smushState;
 }
 
-void Insane::queueSceneSwitch(int32 sceneId, byte *fluPtr, const char *filename, 
+void Insane::queueSceneSwitch(int32 sceneId, byte *fluPtr, const char *filename,
 							  int32 arg_C, int32 arg_10, int32 startFrame, int32 numFrames) {
 	int32 tmp;
-	
+
 	debugC(DEBUG_INSANE, "queueSceneSwitch(%d, *, %s, %d, %d, %d, %d)", sceneId, filename, arg_C, arg_10,
 		  startFrame, numFrames);
 	if (_needSceneSwitch || _sceneData1Loaded)
 		return;
-	
+
 	if (fluPtr) {
 		tmp = ((int)startFrame/30+1)*30;
 		if (tmp >= numFrames)
 			tmp = 0;
-	
+
 		smush_setupSanWithFlu(filename, arg_C|32, -1, -1, 0, fluPtr, tmp);
 	} else {
 		smush_setupSanFromStart(filename, arg_C|32, -1, -1, 0);
@@ -863,7 +863,7 @@
 void Insane::smush_rewindCurrentSan(int arg_0, int arg_4, int arg_8) {
 	debugC(DEBUG_INSANE, "smush_rewindCurrentSan(%d, %d, %d)", arg_0, arg_4, arg_8);
 	_smush_setupsan2 = arg_0;
-	
+
 	smush_setupSanFile(0, 0, 0);
 	_smush_isSanFileSetup = 1;
 	smush_setFrameSteps(arg_4, arg_8);
@@ -876,7 +876,7 @@
 
 	if (_actor[actornum].weapon == -1)
 		return 104;
-	
+
 	return map[_actor[actornum].weapon];
 }
 
@@ -885,7 +885,7 @@
 
 	if (_actor[actornum].weapon == -1)
 		return 40;
-	
+
 	return map[_actor[actornum].weapon];
 }
 
@@ -894,7 +894,7 @@
 
 	if (_actor[actornum].weapon == -1)
 		return 10;
-	
+
 	return map[_actor[actornum].weapon];
 }
 
@@ -932,7 +932,7 @@
 	const int tilt[7] = {-5, -4, -2, 0, 2, 4, 5};
 	if (speed + 3 > 6)
 		return 0;
-	
+
 	return tilt[speed + 3];
 }
 
@@ -942,7 +942,7 @@
 	const int spans[] = {0, 34, 39, 73, 89, 90, 92, 93, 99, 100, 117};
 	bool retvalue = 0;
 	unsigned int i;
-	
+
 	for (i = 0; i < sizeof(spans); i++) {
 		retvalue = !retvalue;
 		if (spans[i] <= state)
@@ -975,7 +975,7 @@
 		break;
 	case 2:
 		flu = &_fluConf[14 + _iactSceneId2];
-		queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0, 
+		queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
 						 flu->startFrame, flu->numFrames);
 		break;
 	case 3:
@@ -984,7 +984,7 @@
 	case 4:
 		if (_needSceneSwitch)
 			return;
-		
+
 		if (readArray(6)) {
 			if (readArray(4)) {
 				queueSceneSwitch(14, 0, "hitdust2.san", 64, 0, 0, 0);
@@ -1026,12 +1026,12 @@
 		break;
 	case 8:
 		flu = &_fluConf[7 + _iactSceneId2];
-		queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0, 
+		queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
 						 flu->startFrame, flu->numFrames);
 		break;
 	case 7:
 		flu = &_fluConf[0 + _iactSceneId2];
-		queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0, 
+		queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
 						 flu->startFrame, flu->numFrames);
 		break;
 	case 23:
@@ -1080,7 +1080,7 @@
 	const int spans[] = {0, 2, 34, 35, 39, 69, 98, 100, 117};
 	bool retvalue = 1;
 	unsigned int i;
-	
+
 	for (i = 0; i < sizeof(spans); i++) {
 		retvalue = !retvalue;
 		if (spans[i] >= state)
@@ -1100,7 +1100,7 @@
 		 866, 867, 872, 920, 922, 923, 926, 927, 931, 933, 950};
 	bool retvalue = 1;
 	unsigned int i;
-	
+
 	for (i = 0; i < sizeof(spans); i++) {
 		retvalue = !retvalue;
 		if (spans[i] >= state)
@@ -1112,22 +1112,22 @@
 // smlayer_loadSound1 && smlayer_loadSound2
 int Insane::smlayer_loadSound(int id, int flag, int phase) {
 	int resid;
-	
+
 	if (phase == 1) {
 		if (_idx2Exceeded != 0)
 			if (_objArray2Idx >= _objArray2Idx2)
 				return 0;
 	}
 	resid = readArray(id);
-	
+
 	if (!resid && phase == 2)
 		return 0;
-	
+
 	if (phase == 2)
 		_vm->ensureResourceLoaded(rtSound, resid);
-	
+
 	_vm->res.setResourceCounter(rtSound, resid, 1);
-	
+
 	if (phase == 1) {
 		_objArray2Idx2++;
 		_objArray2[_objArray2Idx2] = id;
@@ -1143,22 +1143,22 @@
 int Insane::smlayer_loadCostume(int id, int phase) {
 	int resid;
 	resid = readArray(id);
-	
+
 	if (!resid)
 		return 0;
-	
+
 	_vm->ensureResourceLoaded(rtCostume, resid);
 	_vm->res.setResourceCounter(rtCostume, resid, 1);
-	
+
 	// smlayer_lock(rtCostume, resid); // FIXME
-	
+
 	if (phase == 1) {
 		_objArray1Idx2++;
 		_objArray1[_objArray1Idx2] = id;
 		if (_objArray1Idx2 == 100)
 			_objArray1Idx2 = 0;
 	}
-	
+
 	return resid;
 }
 
@@ -1219,8 +1219,8 @@
 	_vm->_imuseDigital->setPriority(soundId, priority);
 }
 
-void Insane::smlayer_drawSomething(byte *renderBitmap, int32 codecparam, 
-			   int32 x, int32 y, int32 arg_10, NutRenderer *nutfile, 
+void Insane::smlayer_drawSomething(byte *renderBitmap, int32 codecparam,
+			   int32 x, int32 y, int32 arg_10, NutRenderer *nutfile,
 			   int32 c, int32 arg_1C, int32 arg_20) {
 	nutfile->drawFrame(renderBitmap, c, x, y);
 }
@@ -1231,8 +1231,8 @@
 	// noop in current implementation
 }
 
-void Insane::smlayer_showStatusMsg(int32 arg_0, byte *renderBitmap, int32 codecparam, 
-					   int32 pos_x, int32 pos_y, int32 arg_14, int32 arg_18, 
+void Insane::smlayer_showStatusMsg(int32 arg_0, byte *renderBitmap, int32 codecparam,
+					   int32 pos_x, int32 pos_y, int32 arg_14, int32 arg_18,
 					   int32 flags, const char *formatString, const char *strng) {
 	SmushFont *sf = _player->_sf[0];
 	int color = 1;
@@ -1255,7 +1255,7 @@
 			{
 				int id = str[3] - '0';
 				str += 4;
-				sf = _player->_sf[id]; 
+				sf = _player->_sf[id];
 			}
 			break;
 		case 'c':
@@ -1278,7 +1278,7 @@
 	// bit 2 - ???          4
 	// bit 3 - wrap around  8
 	switch (flags) {
-	case 0: 
+	case 0:
 		sf->drawString(str, renderBitmap, _player->_width, _player->_height, pos_x, pos_y, false);
 		break;
 	case 1:
@@ -1358,11 +1358,11 @@
 bool Insane::smush_eitherNotStartNewFrame(void) {
 	if (_smush_setupsan17)
 		return false;
-	
+
 	if (_smush_isSanFileSetup) {
 		if (_smush_frameStep < 0)
 			return false;
-	
+
 		if (_smush_curFrame > _smush_frameStep + _smush_frameNum2)
 			return true;
 		else
@@ -1370,7 +1370,7 @@
 	} else {
 		if (_smush_frameNum1 < 0)
 			return false;
-	
+
 		if (_smush_curFrame >= _smush_frameNum1) {
 			_smush_frameNum1 = -1;
 			return false;
@@ -1397,23 +1397,23 @@
 	_vm->writeArray(_numberArray, 0, item, value);
 }
 
-int32 Insane::smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 step1, 
-								   int32 step2, int32 setupsan1, byte *fluPtr, 
+int32 Insane::smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 step1,
+								   int32 step2, int32 setupsan1, byte *fluPtr,
 								   int32 numFrames) {
 	byte *tmp = fluPtr;
 	int32 offset;
-	
+
 	debugC(DEBUG_INSANE, "smush_setupSanWithFlu(%s, %d, %d, %d, %d, %p, %d)", filename, setupsan2,
 		  step1, step2, setupsan1, fluPtr, numFrames);
 
 	_smush_setupsan1 = setupsan1;
-	
+
 	/* skip FLUP marker */
 	if (READ_BE_UINT32(fluPtr) == 'FLUP')
 		tmp += 8;
 
 	_smush_setupsan2 = setupsan2;
-	
+
 	if (tmp[2] <= 1) {
 		/* 0x300 -- palette, 0x8 -- header */
 		offset = READ_LE_UINT32(tmp + 0x308 + numFrames*4);
@@ -1439,7 +1439,7 @@
 	return offset;
 }
 
-void Insane::smush_setupSanFromStart(const char *filename, int32 setupsan2, int32 step1, 
+void Insane::smush_setupSanFromStart(const char *filename, int32 setupsan2, int32 step1,
 									 int32 step2, int32 setupsan1) {
 	debugC(DEBUG_INSANE, "Insane::smush_setupFromStart(%s)", filename);
 	_smush_setupsan1 = setupsan1;

Index: insane.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- insane.h	14 May 2005 23:28:21 -0000	1.19
+++ insane.h	30 Jul 2005 21:11:33 -0000	1.20
@@ -68,13 +68,13 @@
 	void escapeKeyHandler(void);
 
  private:
-	
+
 	ScummEngine_v6 *_vm;
 	SmushPlayer *_player;
-	
+
 	int32 _speed;
 	bool _insaneIsRunning;
-	
+
 	int32 _numberArray;
    	int32 _emulTimerId;
 	int32 _emulateInterrupt;
@@ -193,9 +193,9 @@
 		int32 maxframe;
 		int32 apprAnim;
 	};
-  
+
 	struct enemy _enemy[9];
-  
+
 	struct fluConf {
 		int sceneId;
 		byte **fluPtr;
@@ -228,7 +228,7 @@
 		int32 tilt;
 		int32 frame;
 	};
-  
+
 	struct actor {
 		int32 damage;
 		int32 maxdamage;
@@ -264,7 +264,7 @@
 
 	void initvars(void);
 	void readFileToMem(const char *name, byte **buf);
-	void startVideo(const char *filename, int num, int argC, int frameRate, 
+	void startVideo(const char *filename, int num, int argC, int frameRate,
 					 int doMainLoop, byte *fluPtr = 0, int32 startFrame = 0);
 	void smush_warpMouse(int x, int y, int buttons);
 	void putActors(void);
@@ -330,7 +330,7 @@
 					  int32 setupsan13, int32 curFrame, int32 maxFrame);
 	void switchSceneIfNeeded(void);
 	int smush_changeState(int state);
-	void init_actStruct(int actornum, int actnum, int32 actorval, byte state, 
+	void init_actStruct(int actornum, int actnum, int32 actorval, byte state,
 						  int32 room, int32 animtilt, int32 tilt, int32 frame);
 	void init_enemyStruct(int n, int32 handler, int32 initializer,
 							   int16 occurences, int32 maxdamage, int32 isEmpty,
@@ -363,18 +363,18 @@
 	bool smlayer_startVoice(int32 sound);
 	void smlayer_soundSetPan(int32 sound, int32 pan);
 	void smlayer_soundSetPriority(int32 sound, int32 priority);
-	void smlayer_drawSomething(byte *renderBitmap, int32 codecparam, 
-			   int32 arg_8, int32 arg_C, int32 arg_10, NutRenderer *nutfileptr, 
+	void smlayer_drawSomething(byte *renderBitmap, int32 codecparam,
+			   int32 arg_8, int32 arg_C, int32 arg_10, NutRenderer *nutfileptr,
 			   int32 arg_18, int32 arg_1C, int32 arg_20);
 	void smlayer_overrideDrawActorAt(byte *, byte, byte);
-	void queueSceneSwitch(int32 sceneId, byte *fluPtr, const char *filename, 
+	void queueSceneSwitch(int32 sceneId, byte *fluPtr, const char *filename,
 						  int32 arg_C, int32 arg_10, int32 startFrame, int32 numFrames);
 	void turnBen(bool battle);
 	void smush_rewindCurrentSan(int arg_0, int arg_4, int arg_8);
-	void smlayer_showStatusMsg(int32 arg_0, byte *renderBitmap, int32 codecparam, 
-							   int32 x, int32 y, int32 arg_14, int32 arg_18, 
+	void smlayer_showStatusMsg(int32 arg_0, byte *renderBitmap, int32 codecparam,
+							   int32 x, int32 y, int32 arg_14, int32 arg_18,
 							   int32 arg_1C, const char *formatString, const char *str);
-	void init_fluConfStruct(int n, int sceneId, byte **fluPtr, 
+	void init_fluConfStruct(int n, int sceneId, byte **fluPtr,
 							const char *filenamePtr, int startFrame, int numFrames);
 	int32 processBenOnRoad(bool flag);
 	void mineChooseRoad(int32 arg_0);
@@ -409,9 +409,9 @@
 	void reinitActors(void);
 	const char *handleTrsTag(int32 trsId);
 	void ouchSoundBen(void);
-	int32 smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 step1, 
+	int32 smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 step1,
 							   int32 step2, int32 setupsan1, byte *fluPtr, int32 numFrames);
-	void smush_setupSanFromStart(const char *filename, int32 setupsan2, int32 step1, 
+	void smush_setupSanFromStart(const char *filename, int32 setupsan2, int32 step1,
 								 int32 step2, int32 setupsan1);
 	void smush_setFrameSteps(int32 step1, int32 step2);
 	void smush_setupSanFile(const char *filename, int32 offset, int32 contFrame);

Index: insane_ben.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_ben.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- insane_ben.cpp	24 Jun 2005 15:23:22 -0000	1.26
+++ insane_ben.cpp	30 Jul 2005 21:11:33 -0000	1.27
@@ -33,7 +33,7 @@
 	int32 tmp;
 
 	retval = processMouse();
-	
+
 	// Joystick support is skipped
 
 	retval |= processKeyboard();
@@ -48,13 +48,13 @@
 	_actor[actor1].cursorX = tmp;
 
 	smush_warpMouse(_enemyState[EN_BEN][0], _enemyState[EN_BEN][1], -1);
-	
+
 	return (retval & 3);
 }
 
 void Insane::turnBen(bool controllable) {
 	int32 buttons;
-	
+
 	switch (_currSceneId) {
 	case 21:
 	case 25:
@@ -70,7 +70,7 @@
 				_actor[0].act[1].room = 0;
 				_actor[0].act[0].state = 36;
 				_actor[0].act[0].room = 0;
-		
+
 				if (smlayer_isSoundRunning(95))
 					smlayer_stopSound(95);
 			}
@@ -83,7 +83,7 @@
 			if (_currEnemy == EN_TORQUE)
 				buttons = 0;
 		}
-		debug(5, "00:%d 01:%d 02:%d 03:%d", _actor[0].act[0].state, 
+		debug(5, "00:%d 01:%d 02:%d 03:%d", _actor[0].act[0].state,
 				_actor[0].act[1].state, _actor[0].act[2].state, _actor[0].act[3].state);
 		actor01Reaction(buttons);
 		actor02Reaction(buttons);
@@ -176,7 +176,7 @@
 		} else {
 			if (smlayer_isSoundRunning(sound))
 				smlayer_stopSound(sound);
-			
+
 			_val213d = 0;
 		}
 	} else {
@@ -256,7 +256,7 @@
 					queueSceneSwitch(2, 0, "mineexit.san", 64, 0, 0, 0);
 				}
 			}
-			
+
 			if ((buttons & 2) == 0 || _needSceneSwitch)
 				return;
 
@@ -292,9 +292,9 @@
 				_actor[0].tilt = -7;
 			if (tmp > 7)
 				_actor[0].tilt = 7;
-			
+
 			drawSpeedyActor(buttons);
-			
+
 			if ((buttons & 1) == 0)
 				return;
 
@@ -308,7 +308,7 @@
 					queueSceneSwitch(8, 0, "tomine.san", 64, 0, 0, 0);
 				}
 			}
-			
+
 			if (_roadStop) {
 				writeArray(1, _posBrokenTruck);
 				writeArray(3, _val57d);
@@ -331,7 +331,7 @@
 				_actor[0].tilt = 7;
 
 			drawSpeedyActor(buttons);
-			
+
 			if ((buttons & 1) == 0)
 				return;
 
@@ -345,7 +345,7 @@
 					queueSceneSwitch(7, 0, "tomine.san", 64, 0, 0, 0);
 				}
 			}
-			
+
 			if (_roadStop) {
 				writeArray(1, _posBrokenTruck);
 				writeArray(3, _posVista);
@@ -499,7 +499,7 @@
 // Ben
 void Insane::actor02Reaction(int32 buttons) {
 	int32 tmp, tmp2;
-	
+
 	switch(_actor[0].act[2].state) {
 	case 1:
 		smlayer_setActorLayer(0, 2, 5);
@@ -585,7 +585,7 @@
 			smlayer_setActorFacing(0, 2, 20, 180);
 			_actor[0].act[2].state = 4;
 		}
-	
+
 		_actor[0].kicking = true;
 		_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
 		break;
@@ -725,7 +725,7 @@
 					(_actor[1].x - _actor[0].x >= weaponMinRange(0)) &&
 					!_actor[0].field_54)
 					prepareScenePropScene(1, 0, 0);
-		
+
 			}
 			smlayer_setActorFacing(0, 2, 21, 180);
 			_actor[0].act[2].state = 13;
@@ -766,7 +766,7 @@
 					smlayer_setActorFacing(0, 2, 20, 180);
 					_actor[0].act[2].state = 16;
 				}
-				break;	
+				break;
 			case INV_MACE:
 				if (!_actor[1].kicking || _actor[1].field_44)
 					if (actor1StateFlags(_actor[1].act[2].state)) {
@@ -1153,7 +1153,7 @@
 	case 34:
 		smlayer_setActorLayer(0, 2, 5);
 		_actor[0].kicking = false;
-		
+
 		if (!smlayer_actorNeedRedraw(0, 2)) {
 			setBenState();
 			_actor[0].act[2].tilt = 0;
@@ -1165,7 +1165,7 @@
 	case 35:
 		smlayer_setActorLayer(0, 2, 5);
 		_actor[0].kicking = false;
-		
+
 		if (!smlayer_actorNeedRedraw(0, 2)) {
 			switchBenWeapon();
 			_actor[0].act[2].tilt = 0;
@@ -1211,7 +1211,7 @@
 		smlayer_setActorLayer(0, 2, 25);
 		_actor[0].cursorX = 0;
 		_actor[0].kicking = false;
-		if (_actor[0].act[2].frame >= 18 || 
+		if (_actor[0].act[2].frame >= 18 ||
 			(_actor[0].x < 50 && _actor[0].act[2].frame >= 10) ||
 			 (_actor[0].x > 270 && _actor[0].act[2].frame >= 10)) {
 			if (_currSceneId == 21) {
@@ -1631,7 +1631,7 @@
 			setBenAnimation(0, 6);
 			_actor[0].act[1].state = 41;
 		}
-	
+
 		if (_actor[0].cursorX >= -100) {
 			setBenAnimation(0, 7);
 			_actor[0].act[1].state = 40;
@@ -1654,7 +1654,7 @@
 			setBenAnimation(0, 8);
 			_actor[0].act[1].state = 39;
 		}
-	
+
 		if (_actor[0].field_8 == 48)
 			_actor[0].tilt = 0;
 		else
@@ -1705,7 +1705,7 @@
 			setBenAnimation(0, 12);
 			_actor[0].act[1].state = 57;
 		}
-	
+
 		if (_actor[0].cursorX <= 100) {
 			setBenAnimation(0, 11);
 			_actor[0].act[1].state = 56;
@@ -1714,7 +1714,7 @@
 		}
 		break;
 	}
-	
+
 	if (_actor[0].field_38 != _actor[0].field_34) {
 		if (_actor[0].field_34 == 2)
 			smlayer_setActorFacing(0, 1, 28, 180);
@@ -1727,7 +1727,7 @@
 
 	if (_actor[0].act[1].room)
 		smlayer_putActor(0, 1, tmpx, tmpy, _smlayer_room2);
-	else 
+	else
 		smlayer_putActor(0, 1, tmpx, tmpy, _smlayer_room);
 
 	_actor[0].animWeaponClass = _actor[0].weaponClass;
@@ -1744,7 +1744,7 @@
 	case 52:
 		if (_actor[0].runningSound)
 			smlayer_stopSound(_actor[0].runningSound);
-		
+
 		if (_currScenePropIdx)
 			shutCurrentScene();
 
@@ -1877,7 +1877,7 @@
 			_actor[0].act[2].state = 0;
 			switchBenWeapon();
 		}
-		
+
 		_weaponBenJustSwitched = true;
 	} else {
 		_weaponBenJustSwitched = false;

Index: insane_enemy.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_enemy.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- insane_enemy.cpp	24 Jun 2005 15:23:22 -0000	1.21
+++ insane_enemy.cpp	30 Jul 2005 21:11:33 -0000	1.22
@@ -114,7 +114,7 @@
 	act2damage = _actor[actor2].damage; // ebp
 	act1x = _actor[actor1].x; // esi
 	act2x = _actor[actor2].x; // edi
-	
+
 	if (!_actor[actor1].defunct) {
 		if (_enHdlVar[EN_ROTT1][1] > _enHdlVar[EN_ROTT1][2]) {
 			if (act1damage - act2damage >= 30) {
@@ -278,7 +278,7 @@
 	act2damage = _actor[actor2].damage; // ebp
 	act1x = _actor[actor1].x; // esi
 	act2x = _actor[actor2].x; // edi
-	
+
 	if (!_actor[actor1].defunct) {
 		if (_enHdlVar[EN_ROTT2][1] > _enHdlVar[EN_ROTT2][2]) {
 			if (act1damage - act2damage >= 30) {
@@ -572,7 +572,7 @@
 	act2damage = _actor[actor2].damage; // ebp
 	act1x = _actor[actor1].x; // esi
 	act2x = _actor[actor2].x; // edi
-	
+
 	if (!_actor[actor1].defunct) {
 		if (_enHdlVar[EN_VULTF1][1] > _enHdlVar[EN_VULTF1][2]) {
 			if ((act1damage - act2damage >= 30) && (_vm->_rnd.getRandomNumber(probability - 1) != 1))
@@ -680,7 +680,7 @@
 				}
 				_enHdlVar[EN_VULTF1][7] = _enHdlVar[EN_VULTF1][8];
 			}
-			
+
 		}
 		_enHdlVar[EN_VULTF1][1]++;
 		_enHdlVar[EN_VULTF1][3]++;
@@ -898,7 +898,7 @@
 	act1damage = _actor[actor1].damage; // ebx
 	act1x = _actor[actor1].x; // esi
 	act2x = _actor[actor2].x; // ebp
-	
+
 	dist = ABS(act1x - act2x);
 
 	if (weaponMaxRange(actor1) >= dist) {
@@ -1203,7 +1203,7 @@
 			goto _labelA;
 		}
 	}
-	
+
 	if (weaponMaxRange(actor1) <= dist) {
 		if (act2x < act1x)
 			_actor[actor1].cursorX = -101;
@@ -1358,7 +1358,7 @@
 		if (battle)
 			buttons = actionEnemy();
 
-	debug(5, "11:%d 12:%d 13:%d 10:%d", _actor[1].act[1].state, 
+	debug(5, "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);
 	actor11Reaction(buttons);
 	actor12Reaction(buttons);
@@ -1377,7 +1377,7 @@
 			setEnemyAnimation(1, 6);
 			_actor[1].act[1].state = 41;
 		}
-	
+
 		if (_actor[1].cursorX >= -100) {
 			setEnemyAnimation(1, 7);
 			_actor[1].act[1].state = 40;
@@ -1404,7 +1404,7 @@
 		    setEnemyAnimation(1, 8);
 			_actor[1].act[1].state = 39;
 		}
-	
+
 		if (_actor[1].field_8 == 48)
 			_actor[1].tilt = 0;
 		else
@@ -1461,7 +1461,7 @@
 			setEnemyAnimation(1, 12);
 			_actor[1].act[1].state = 57;
 		}
-	
+
 		if (_actor[1].cursorX <= 100) {
 			setEnemyAnimation(1, 11);
 			_actor[1].act[1].state = 56;
@@ -1472,13 +1472,13 @@
 		_actor[1].x += _actor[1].cursorX / 32;
 		break;
 	}
-	
+
 	tmpx = _actor[1].x;
 	tmpy = _actor[1].y + _actor[1].y1;
 
 	if (_actor[1].act[1].room)
 		smlayer_putActor(1, 1, tmpx, tmpy, _smlayer_room2);
-	else 
+	else
 		smlayer_putActor(1, 1, tmpx, tmpy, _smlayer_room);
 
 	_actor[1].animWeaponClass = _actor[1].weaponClass;
@@ -1545,7 +1545,7 @@
 		default:
 			switchEnemyWeapon();
 		}
-		
+
 		_weaponEnemyJustSwitched = true;
 	} else {
 		_weaponEnemyJustSwitched = false;
@@ -1599,7 +1599,7 @@
 			_actor[1].act[2].state = 98;
 		else
 			_actor[1].act[2].state = 99;
-		
+
 		return;
 	}
 
@@ -1818,7 +1818,7 @@
 					smlayer_setActorFacing(1, 2, 20, 180);
 					_actor[1].act[2].state = 16;
 				}
-				break;	
+				break;
 			default:
 				smlayer_setActorFacing(1, 2, 20, 180);
 				_actor[1].act[2].state = 16;
@@ -1986,7 +1986,7 @@
 			} else {
 				smlayer_setActorFacing(1, 2, 20, 180);
 				_actor[1].act[2].state = 24;
-				
+
 				if (!_actor[1].field_54)
 					smlayer_startSfx(246);
 			}
@@ -2080,7 +2080,7 @@
 	case 34:
 		smlayer_setActorLayer(1, 2, 5);
 		_actor[1].kicking = false;
-		
+
 		if (!smlayer_actorNeedRedraw(1, 2)) {
 			setEnemyState();
 			_actor[1].act[2].tilt = 0;
@@ -2092,7 +2092,7 @@
 	case 35:
 		smlayer_setActorLayer(1, 2, 5);
 		_actor[1].kicking = false;
-		
+
 		if (!smlayer_actorNeedRedraw(1, 2)) {
 			switchEnemyWeapon();
 			_actor[1].act[2].tilt = 0;
@@ -2400,7 +2400,7 @@
 		smlayer_setActorLayer(1, 2, 4);
 		_actor[1].kicking = false;
 		if (_actor[1].act[2].frame >= 19) {
-			queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, 
+			queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0,
 							 _continueFrame1, 1300);
 			_actor[1].act[2].state = 96;
 		}
@@ -2464,7 +2464,7 @@
 		_actor[1].act[2].state = 103;
 	case 103:
 		_actor[1].kicking = false;
-		
+
 		if (_actor[1].act[2].frame >= 18 || ((_actor[1].x < 50 || _actor[1].x > 270) &&
 											 _actor[1].act[2].frame >= 9)) {
 			_enemy[EN_CAVEFISH].isEmpty = 1;
@@ -2541,7 +2541,7 @@
 	case 114:
 		smlayer_setActorLayer(1, 2, 25);
 		_actor[1].kicking = false;
-		
+
 		if (_actor[1].act[2].frame >= 16 || ((_actor[1].x < 50 || _actor[1].x > 270)
 											 && (_actor[1].act[2].frame >= 8))) {
 			queueSceneSwitch(11, 0, _enemy[_currEnemy].filename, 64, 0, 0, 0);
@@ -2563,7 +2563,7 @@
 	case 116:
 		smlayer_setActorLayer(1, 2, 25);
 		_actor[1].kicking = false;
-		
+
 		if (_actor[1].act[2].frame >= 17 || ((_actor[1].x < 50 || _actor[1].x > 270)
 											 && _actor[1].act[2].frame >= 8)) {
 			queueSceneSwitch(11, 0, _enemy[_currEnemy].filename, 64, 0, 0, 0);
@@ -2621,7 +2621,7 @@
 	case 52:
 		if (_actor[1].runningSound)
 			smlayer_stopSound(_actor[1].runningSound);
-		
+
 		if (_currScenePropIdx)
 			shutCurrentScene();
 
@@ -2794,7 +2794,7 @@
 		if (_actor[0].x + 90 > _actor[1].x)
 			_actor[1].x = _actor[0].x + 90;
 	}
-		
+
 	if (_actor[1].x < 0) {
 		_actor[1].x = 0;
 		_actor[1].x1 = -_actor[1].x1;

Index: insane_iact.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_iact.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- insane_iact.cpp	24 Jun 2005 15:23:22 -0000	1.20
+++ insane_iact.cpp	30 Jul 2005 21:11:33 -0000	1.21
@@ -118,7 +118,7 @@
 		par11 = b.getWord(); // +20 cx
 		tmp = b.getWord();   // +22
 		par13 = b.getWord(); // +24 ax
-		
+
 		if (par13 > _actor[0].x || par11 < _actor[0].x) {
 			_tiresRustle = true;
 			_actor[0].x1 = -_actor[0].x1;
@@ -133,12 +133,12 @@
 	case 6:
 		switch (par2) {
 		case 38:
-			smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3, 
+			smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3,
 								  _smush_iconsNut, 7, 0, 0);
 			_roadBranch = true;
 			_iactSceneId = par4;
 			break;
-		case 25:				
+		case 25:
 			_roadBumps = true;
 			_actor[0].y1 = -_actor[0].y1;
 			break;
@@ -177,7 +177,7 @@
 
 	if (_approachAnim < 0 || _approachAnim > 4)
 		if (readArray(8)) {
-			smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-18, 3, 
+			smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-18, 3,
 								  _smush_iconsNut, 20, 0, 0);
 			_benHasGoggles = true;
 		}
@@ -232,7 +232,7 @@
 			}
 			if (!notfound) {
 				continue;
-			}			
+			}
 		} else {
 			j = 0;
 			do {
@@ -250,11 +250,11 @@
 			} while (j < 9 && !notfound);
 			if (!notfound) {
 				_metEnemiesListTail = 0;
-				count = 0;				
+				count = 0;
 				continue;
 			}
 		}
-	
+
 		++_metEnemiesListTail;
 		assert(_metEnemiesListTail < ARRAYSIZE(_metEnemiesList));
 		_metEnemiesList[_metEnemiesListTail] = en2;
@@ -362,8 +362,8 @@
 	case 6:
 		switch (par2) {
 		case 38:
-			
-			smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-13, 3, 
+
+			smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-13, 3,
 								  _smush_icons2Nut, 10, 0, 0);
 			_roadBranch = true;
 			_iactSceneId = par4;
@@ -385,16 +385,16 @@
 			smush_setToFinish();
 
 			break;
-		case 25:				
+		case 25:
 			if (readArray(5) == 0)
 				return;
-			
+
 			_carIsBroken = true;
 			smlayer_drawSomething(renderBitmap, codecparam, 160-13, 20-10, 3, // QW
 								  _smush_icons2Nut, 8, 0, 0);
 			break;
 		case 11:
-			smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3, 
+			smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3,
 								  _smush_icons2Nut, 9, 0, 0);
 			_roadBranch = true;
 			_iactSceneId = par4;
@@ -454,7 +454,7 @@
 	case 6:
 		switch (par2) {
 		case 38:
-			smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-13, 3, 
+			smlayer_drawSomething(renderBitmap, codecparam, 270-19, 20-13, 3,
 								  _smush_icons2Nut, 10, 0, 0);
 			_roadBranch = true;
 			_iactSceneId = par4;
@@ -476,16 +476,16 @@
 			smush_setToFinish();
 
 			break;
-		case 25:				
+		case 25:
 			if (readArray(5) == 0)
 				return;
-			
+
 			_carIsBroken = true;
 			smlayer_drawSomething(renderBitmap, codecparam, 160-13, 20-10, 3, //QW
 								  _smush_icons2Nut, 8, 0, 0);
 			break;
 		case 11:
-			smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3, 
+			smlayer_drawSomething(renderBitmap, codecparam, 50-19, 20-13, 3,
 								  _smush_icons2Nut, 9, 0, 0);
 			_roadBranch = true;
 			_iactSceneId = par4;
@@ -517,7 +517,7 @@
 	case 6:
 		switch (par2) {
 		case 38:
-			smlayer_drawSomething(renderBitmap, codecparam, 28, 48, 1, 
+			smlayer_drawSomething(renderBitmap, codecparam, 28, 48, 1,
 								  _smush_iconsNut, 6, 0, 0);
 			_roadBranch = true;
 			_iactSceneId = par4;
@@ -531,7 +531,7 @@
 			_objectDetected = true;
 			break;
 		case 10:
-			smlayer_drawSomething(renderBitmap, codecparam, 28, 48, 1, 
+			smlayer_drawSomething(renderBitmap, codecparam, 28, 48, 1,
 								  _smush_iconsNut, 6, 0, 0);
 			if (_counter1 <= 4) {
 				if (_counter1 == 4)

Index: insane_scenes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_scenes.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- insane_scenes.cpp	23 Jul 2005 15:47:49 -0000	1.30
+++ insane_scenes.cpp	30 Jul 2005 21:11:33 -0000	1.31
@@ -164,7 +164,7 @@
 	}
 	// insane_unlock(); // FIXME
 	_vm->_sound->stopAllSounds(); // IMUSE_StopAllSounds();
-	
+
 	delete _player;
 }
 
@@ -223,14 +223,14 @@
 		if (_actor[0].runningSound != 0)
 			smlayer_stopSound(_actor[0].runningSound);
 		_actor[0].runningSound = 0;
-	
+
 		if (_actor[1].runningSound != 0)
 			smlayer_stopSound(_actor[1].runningSound);
 		_actor[1].runningSound = 0;
-	
+
 		if (_currScenePropIdx != 0)
 			shutCurrentScene();
-	
+
 		_currScenePropSubIdx = 0;
 		_currTrsMsg = 0;
 		_actor[0].defunct = 0;
@@ -283,7 +283,7 @@
 	smlayer_setActorCostume(1, 2, 0);
 	smlayer_setActorCostume(1, 0, 0);
 	smlayer_setActorCostume(1, 1, 0);
-	
+
 	return;
 }
 
@@ -295,7 +295,7 @@
 	_currScenePropSubIdx = 0;
 	_actor[1].scenePropSubIdx = 0;
 	_actor[1].defunct = 0;
-	
+
 	if (_actor[1].runningSound != 0) {
 		smlayer_stopSound(_actor[1].runningSound);
 		_actor[1].runningSound = 0;
@@ -684,7 +684,7 @@
 	smlayer_putActor(0, 2, _actor[0].x+11, _actor[0].y1+102, _smlayer_room2);
 	smlayer_putActor(0, 1, _actor[0].x, _actor[0].y1+200, _smlayer_room2);
 	smlayer_putActor(0, 0, _actor[0].x, _actor[0].y1+200, _smlayer_room2);
-	
+
 	if (_currEnemy == EN_CAVEFISH) {
 		smlayer_setActorCostume(1, 2, readArray(_enemy[_currEnemy].costume4));
 		_actor[1].act[2].room = 1;
@@ -695,8 +695,8 @@
 		_actor[1].act[2].state = 98;
 		_actor[1].act[0].state = 98;
 		_actor[1].act[1].state = 98;
-	
-		smlayer_putActor(1, 2, _actor[1].x + _actor[1].act[2].tilt - 17, 
+
+		smlayer_putActor(1, 2, _actor[1].x + _actor[1].act[2].tilt - 17,
 						 _actor[1].y + _actor[1].y1 - 98, _smlayer_room2);
 	} else if (_currEnemy == EN_TORQUE) {
 		smlayer_setActorCostume(1, 2, readArray(_enemy[_currEnemy].costume4));
@@ -707,45 +707,45 @@
 		_actor[1].act[2].state = 1;
 		_actor[1].act[0].state = 1;
 		_actor[1].act[1].state = 1;
-		smlayer_putActor(1, 2, _actor[1].x + _actor[1].act[2].tilt - 17, 
+		smlayer_putActor(1, 2, _actor[1].x + _actor[1].act[2].tilt - 17,
 						 _actor[1].y + _actor[1].y1 - 98, _smlayer_room2);
 	} else {
 		_actor[1].act[2].room = 1;
 		_actor[1].act[1].room = 1;
 		_actor[1].act[0].room = 1;
-	
+
 		if (_enemy[_currEnemy].costume4)
 			smlayer_setActorCostume(1, 2, readArray(_enemy[_currEnemy].costume4));
-	
+
 		if (_enemy[_currEnemy].costume5)
 			smlayer_setActorCostume(1, 0, readArray(_enemy[_currEnemy].costume5));
-	
+
 		if (_enemy[_currEnemy].costume6)
 			smlayer_setActorCostume(1, 1, readArray(_enemy[_currEnemy].costume6));
-	
+
 		_actor[1].field_8 = 1;
 		_actor[1].act[2].state = 1;
 		_actor[1].act[0].state = 1;
 		_actor[1].act[1].state = 1;
-	
+
 		if (_actor[1].act[2].room != 0)
-			smlayer_putActor(1, 2, _actor[1].x + _actor[1].act[2].tilt - 17, 
-							 _actor[1].y + _actor[1].y1 - 98, 
+			smlayer_putActor(1, 2, _actor[1].x + _actor[1].act[2].tilt - 17,
+							 _actor[1].y + _actor[1].y1 - 98,
 							 _smlayer_room2);
 	}
-	
+
 	if (_actor[1].act[1].room != 0)
 		smlayer_putActor(1, 1, _actor[1].x, _actor[1].y + _actor[1].y1,
 						 _smlayer_room2);
-	
+
 	if (_actor[1].act[0].room != 0)
-		smlayer_putActor(1, 0, _actor[1].x, _actor[1].y + _actor[1].y1, 
+		smlayer_putActor(1, 0, _actor[1].x, _actor[1].y + _actor[1].y1,
 						 _smlayer_room2);
-	
+
 	smlayer_setActorLayer(1, 1, 1);
 	smlayer_setActorLayer(1, 2, 5);
 	smlayer_setActorLayer(1, 0, 10);
-	
+
 	_actor[1].damage = 0;
 	_actor[1].x = 250;
 	_actor[1].y = 300;
@@ -795,7 +795,7 @@
 	_actor[1].field_44 = false;
 	_actor[1].field_48 = false;
 	if (_enemy[_currEnemy].initializer != -1)
-		enemyInitializer(_enemy[_currEnemy].initializer, _actor[1].damage, 
+		enemyInitializer(_enemy[_currEnemy].initializer, _actor[1].damage,
 							 _actor[0].damage, _actor[1].probability);
 
 	smush_warpMouse(160, 100, -1);
@@ -963,7 +963,7 @@
 
 		if (_currScenePropIdx)
 			postCaseAll(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
-	
+
 		_actor[0].frame++;
 		_actor[0].act[3].frame++;
 		_actor[0].act[2].frame++;
@@ -975,21 +975,21 @@
 		_actor[1].act[1].frame++;
 		_actor[1].act[0].frame++;
 	}
-	
+
 	if (!_val115_) {
 		smlayer_overrideDrawActorAt(&renderBitmap[0], renderBitmap[2], renderBitmap[3]);
 		_isBenCut = 0;
 	}
-	
+
 	if (_isBenCut)
 		smlayer_drawSomething(renderBitmap, codecparam, 89, 56, 1, _smush_bencutNut, 0, 0, 0);
-	
+
 	if (!_keyboardDisable)
 		_vm->processActors();
-	
+
 	if (needMore)
 		postCaseMore(renderBitmap, codecparam, setupsan12, setupsan13, curFrame, maxFrame);
-	
+
 	_lastKey = 0;
 	_tiresRustle = false;
 }
@@ -1000,7 +1000,7 @@
 		if (_firstBattle) {
 			smush_setToFinish();
 		} else {
-			queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0, 
+			queueSceneSwitch(1, _smush_minedrivFlu, "minedriv.san", 64, 0,
 							 _continueFrame, 1300);
 		}
 	}
@@ -1011,13 +1011,13 @@
 void Insane::postCase0(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 					   int32 setupsan13, int32 curFrame, int32 maxFrame) {
 	turnBen(true);
-	
+
 	if (!curFrame || curFrame == 420)
 		smlayer_setFluPalette(_smush_roadrashRip, 0);
-	
+
 	if (curFrame >= maxFrame)
 		smush_rewindCurrentSan(1088, -1, -1);
-	
+
 	_roadBumps = false;
 	_roadBranch = false;
 	_roadStop = false;
@@ -1030,7 +1030,7 @@
 						int32 setupsan13, int32 curFrame, int32 maxFrame) {
 	if (curFrame >= maxFrame && !_needSceneSwitch) {
 		if (_currSceneId == 18) {
-			queueSceneSwitch(17, _smush_minedrivFlu, "minedriv.san", 64, 0, 
+			queueSceneSwitch(17, _smush_minedrivFlu, "minedriv.san", 64, 0,
 							 _continueFrame1, 1300);
 			writeArray(9, 1);
 		} else {
@@ -1047,31 +1047,31 @@
 						int32 setupsan13, int32 curFrame, int32 maxFrame) {
 	char buf[12];
 	int32 tmp;
-	
+
 	turnBen(true);
 	sprintf(buf, "^f01%02o", curFrame & 0x3f);
 	smlayer_showStatusMsg(-1, renderBitmap, codecparam, 180, 168, 1, 2, 0, "%s", buf);
 	tmp = 400-curFrame;
-	
+
 	if (tmp < 0)
 		tmp += 1300;
-	
+
 	sprintf(buf, "^f01%04d", tmp);
 	smlayer_showStatusMsg(-1, renderBitmap, codecparam, 202, 168, 1, 2, 0, "%s", buf);
-	
+
 	sprintf(buf, "^f01%02o", curFrame & 0xff);
 	smlayer_showStatusMsg(-1, renderBitmap, codecparam, 240, 168, 1, 2, 0, "%s", buf);
 	smlayer_showStatusMsg(-1, renderBitmap, codecparam, 170, 43, 1, 2, 0, "%s", buf);
 
 	smlayer_drawSomething(renderBitmap, codecparam, 0, 0, 1, _smush_bensgoggNut, 0, 0, 0);
-	
+
 	if (!_objectDetected)
-		smlayer_drawSomething(renderBitmap, codecparam, 24, 170, 1, 
+		smlayer_drawSomething(renderBitmap, codecparam, 24, 170, 1,
 							  _smush_iconsNut, 23, 0, 0);
-	
+
 	if (!curFrame)
 		smlayer_setFluPalette(_smush_goglpaltRip, 0);
-	
+
 	if (curFrame >= maxFrame) {
 		smush_rewindCurrentSan(1088, -1, -1);
 		smlayer_setFluPalette(_smush_goglpaltRip, 0);
@@ -1093,7 +1093,7 @@
 
 	if ((curFrame >= maxFrame) && !_needSceneSwitch) {
 		flu = &_fluConf[14 + _iactSceneId2];
-		queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0, 
+		queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
 						 flu->startFrame, flu->numFrames);
 	}
 	_roadBranch = false;
@@ -1104,7 +1104,7 @@
 					   int32 setupsan13, int32 curFrame, int32 maxFrame) {
 	turnBen(_battleScene != 0);
 	turnEnemy(true);
-	
+
 	if (!curFrame)
 		smlayer_setFluPalette(_smush_roadrashRip, 0);
 
@@ -1121,10 +1121,10 @@
 						int32 setupsan13, int32 curFrame, int32 maxFrame) {
 	turnBen(true);
 	turnEnemy(true);
-	
+
 	if (curFrame >= maxFrame)
 		smush_rewindCurrentSan(1088, -1, -1);
-	
+
 	_roadBumps = false;
 	_roadBranch = false;
 	_roadStop = false;
@@ -1204,7 +1204,7 @@
 			}
 		}
 	}
-	
+
 	_carIsBroken = false;
 	_roadStop = false;
 	_roadBranch = false;
@@ -1221,7 +1221,7 @@
 		else
 			flu = &_fluConf[0 + _iactSceneId2];
 
-		queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0, 
+		queueSceneSwitch(flu->sceneId, *flu->fluPtr, flu->filenamePtr, 64, 0,
 						 flu->startFrame, flu->numFrames);
 	}
 	_roadBranch = false;
@@ -1245,7 +1245,7 @@
 			}
 		}
  	}
-	
+
 	_roadBranch = false;
 	_roadStop = false;
 }
@@ -1306,7 +1306,7 @@
 			}
 		}
  	}
-	
+
 	_roadBranch = false;
 	_roadStop = false;
 }

More information about the Scummvm-git-logs mailing list