More DISABLE_SCUMM_7_8

svn-id: r18967

5 files changed, 62 insertions, 42 deletions

diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp
index aed10e6d1c..2aafc3626a 100644
--- a/scumm/insane/insane.cpp
+++ b/scumm/insane/insane.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#ifndef DISABLE_SCUMM_7_8
+
 #include "common/stdafx.h"
 
 #include "base/engine.h"
@@ -1463,3 +1465,5 @@ void Insane::smush_setupSanFile(const char *filename, int32 offset, int32 contFr
 }
 
 }
+
+#endif
diff --git a/scumm/insane/insane_ben.cpp b/scumm/insane/insane_ben.cpp
index a010aa5ed3..dd5aac9904 100644
--- a/scumm/insane/insane_ben.cpp
+++ b/scumm/insane/insane_ben.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#ifndef DISABLE_SCUMM_7_8
+
 #include "common/stdafx.h"
 
 #include "base/engine.h"
@@ -2006,3 +2008,5 @@ void Insane::ouchSoundBen(void) {
 }
 
 }
+
+#endif
diff --git a/scumm/insane/insane_enemy.cpp b/scumm/insane/insane_enemy.cpp
index 42f9314c1a..87a0acbae4 100644
--- a/scumm/insane/insane_enemy.cpp
+++ b/scumm/insane/insane_enemy.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#ifndef DISABLE_SCUMM_7_8
+
 #include "common/stdafx.h"
 
 #include "base/engine.h"
@@ -114,7 +116,7 @@ int32 Insane::enemy0handler(int32 actor1, int32 actor2, int32 probability) {
 	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 +280,7 @@ int32 Insane::enemy1handler(int32 actor1, int32 actor2, int32 probability) {
 	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 +574,7 @@ int32 Insane::enemy3handler(int32 actor1, int32 actor2, int32 probability) {
 	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 +682,7 @@ int32 Insane::enemy3handler(int32 actor1, int32 actor2, int32 probability) {
 				}
 				_enHdlVar[EN_VULTF1][7] = _enHdlVar[EN_VULTF1][8];
 			}
-
+			
 		}
 		_enHdlVar[EN_VULTF1][1]++;
 		_enHdlVar[EN_VULTF1][3]++;
@@ -898,7 +900,7 @@ int32 Insane::enemy5handler(int32 actor1, int32 actor2, int32 probability) {
 	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 +1205,7 @@ int32 Insane::enemy7handler(int32 actor1, int32 actor2, int32 probability) {
 			goto _labelA;
 		}
 	}
-
+	
 	if (weaponMaxRange(actor1) <= dist) {
 		if (act2x < act1x)
 			_actor[actor1].cursorX = -101;
@@ -1358,7 +1360,7 @@ void Insane::turnEnemy(bool battle) {
 		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 +1379,7 @@ void Insane::actor11Reaction(int32 buttons) {
 			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 +1406,7 @@ void Insane::actor11Reaction(int32 buttons) {
 		    setEnemyAnimation(1, 8);
 			_actor[1].act[1].state = 39;
 		}
-
+	
 		if (_actor[1].field_8 == 48)
 			_actor[1].tilt = 0;
 		else
@@ -1461,7 +1463,7 @@ void Insane::actor11Reaction(int32 buttons) {
 			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 +1474,13 @@ void Insane::actor11Reaction(int32 buttons) {
 		_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 +1547,7 @@ void Insane::chooseEnemyWeaponAnim(int32 buttons) {
 		default:
 			switchEnemyWeapon();
 		}
-
+		
 		_weaponEnemyJustSwitched = true;
 	} else {
 		_weaponEnemyJustSwitched = false;
@@ -1599,7 +1601,7 @@ void Insane::setEnemyState(void) {
 			_actor[1].act[2].state = 98;
 		else
 			_actor[1].act[2].state = 99;
-
+		
 		return;
 	}
 
@@ -1818,7 +1820,7 @@ void Insane::actor12Reaction(int32 buttons) {
 					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 +1988,7 @@ void Insane::actor12Reaction(int32 buttons) {
 			} else {
 				smlayer_setActorFacing(1, 2, 20, 180);
 				_actor[1].act[2].state = 24;
-
+				
 				if (!_actor[1].field_54)
 					smlayer_startSfx(246);
 			}
@@ -2080,7 +2082,7 @@ void Insane::actor12Reaction(int32 buttons) {
 	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 +2094,7 @@ void Insane::actor12Reaction(int32 buttons) {
 	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 +2402,7 @@ void Insane::actor12Reaction(int32 buttons) {
 		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 +2466,7 @@ void Insane::actor12Reaction(int32 buttons) {
 		_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 +2543,7 @@ void Insane::actor12Reaction(int32 buttons) {
 	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 +2565,7 @@ void Insane::actor12Reaction(int32 buttons) {
 	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 +2623,7 @@ void Insane::actor13Reaction(int32 buttons) {
 	case 52:
 		if (_actor[1].runningSound)
 			smlayer_stopSound(_actor[1].runningSound);
-
+		
 		if (_currScenePropIdx)
 			shutCurrentScene();
 
@@ -2794,7 +2796,7 @@ int32 Insane::actionEnemy(void) {
 		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;
@@ -2808,3 +2810,5 @@ int32 Insane::actionEnemy(void) {
 }
 
 }
+
+#endif
diff --git a/scumm/insane/insane_iact.cpp b/scumm/insane/insane_iact.cpp
index 0909f1c7bc..cf35f21a15 100644
--- a/scumm/insane/insane_iact.cpp
+++ b/scumm/insane/insane_iact.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#ifndef DISABLE_SCUMM_7_8
+
 #include "common/stdafx.h"
 
 #include "base/engine.h"
@@ -118,7 +120,7 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 		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 +135,12 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 	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 +179,7 @@ void Insane::iactScene1(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 
 	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 +234,7 @@ void Insane::chooseEnemy(void) {
 			}
 			if (!notfound) {
 				continue;
-			}
+			}			
 		} else {
 			j = 0;
 			do {
@@ -250,11 +252,11 @@ void Insane::chooseEnemy(void) {
 			} while (j < 9 && !notfound);
 			if (!notfound) {
 				_metEnemiesListTail = 0;
-				count = 0;
+				count = 0;				
 				continue;
 			}
 		}
-
+	
 		++_metEnemiesListTail;
 		assert(_metEnemiesListTail < ARRAYSIZE(_metEnemiesList));
 		_metEnemiesList[_metEnemiesListTail] = en2;
@@ -362,8 +364,8 @@ void Insane::iactScene4(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 	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 +387,16 @@ void Insane::iactScene4(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 			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 +456,7 @@ void Insane::iactScene6(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 	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 +478,16 @@ void Insane::iactScene6(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 			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 +519,7 @@ void Insane::iactScene17(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 	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 +533,7 @@ void Insane::iactScene17(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 			_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)
@@ -554,3 +556,5 @@ void Insane::iactScene21(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 }
 
 }
+
+#endif
diff --git a/scumm/insane/insane_scenes.cpp b/scumm/insane/insane_scenes.cpp
index a805425819..be2a58e263 100644
--- a/scumm/insane/insane_scenes.cpp
+++ b/scumm/insane/insane_scenes.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#ifndef DISABLE_SCUMM_7_8
+
 #include "common/stdafx.h"
 
 #include "base/engine.h"
@@ -1495,3 +1497,5 @@ void Insane::postCaseMore(byte *renderBitmap, int32 codecparam, int32 setupsan12
 }
 
 }
+
+#endif