[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.56,1.57 insane_ben.cpp,1.23,1.24 insane_enemy.cpp,1.17,1.18 insane_iact.cpp,1.18,1.19 insane_scenes.cpp,1.26,1.27

[Max Horn]

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

Modified Files:
	insane.cpp insane_ben.cpp insane_enemy.cpp insane_iact.cpp 
	insane_scenes.cpp 
Log Message:
Replaced the platform specific GF_FOO switches (using _platform instead now)

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- insane.cpp	3 Apr 2005 06:27:43 -0000	1.56
+++ insane.cpp	20 Apr 2005 18:21:13 -0000	1.57
@@ -54,7 +54,7 @@
 	
 	initvars();
 
-	if (!((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) {
+	if (!((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))) {
 		readFileToMem("roadrash.rip", &_smush_roadrashRip);
 		readFileToMem("roadrsh2.rip", &_smush_roadrsh2Rip);
 		readFileToMem("roadrsh3.rip", &_smush_roadrsh3Rip);
@@ -178,7 +178,7 @@
 		_iactBits[i] = 0;
 
 	
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 		init_enemyStruct(EN_ROTT1, EN_ROTT1, 0, 0, 160, 0, INV_MACE, 63, "endcrshr.san", 
 						 25, 15, 16, 26, 11, 3);
 	} else {
@@ -633,7 +633,7 @@
 
 void Insane::readState(void) { // PATCH
 
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 		_actor[0].inventory[INV_CHAIN] = 0;
 		_actor[0].inventory[INV_CHAINSAW] = 0;
 		_actor[0].inventory[INV_MACE] = 0;
@@ -795,7 +795,7 @@
 
 	debugC(DEBUG_INSANE, "Insane::prepareScenePropScene(%d, %d, %d)", scenePropNum, arg_4, arg_8);
 
-	if (((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) || !loadScenePropSounds(idx))
+	if (((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) || !loadScenePropSounds(idx))
 			return;
 
 	_actor[0].defunct = arg_4;
@@ -892,7 +892,7 @@
 }
 
 void Insane::reinitActors(void) {
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 		smlayer_setActorCostume(0, 2, readArray(11));
 		smlayer_setActorCostume(0, 0, readArray(13));
 		smlayer_setActorCostume(0, 1, readArray(12));
@@ -1174,7 +1174,7 @@
 }
 
 void Insane::smlayer_setFluPalette(byte *pal, int shut_flag) {
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))
 		return;
 
 	//	  if (shut_flag)
@@ -1290,7 +1290,7 @@
 	int16 par1, par2;
 	_player->_skipNext = false;
 
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 		_player->checkBlock(b, TYPE_SKIP, 2);
 		par1 = b.getWord();
 		if (isBitSet(par1))

Index: insane_ben.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_ben.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- insane_ben.cpp	1 Jan 2005 16:09:18 -0000	1.23
+++ insane_ben.cpp	20 Apr 2005 18:21:28 -0000	1.24
@@ -124,7 +124,7 @@
 	bool doDamage = false;
 	int sound;
 
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))
 		sound = 59;
 	else
 		sound = 95;
@@ -565,7 +565,7 @@
 		if (_actor[0].act[2].frame == 2) {
 			if (_currEnemy != EN_CAVEFISH) {
 				tmp = calcEnemyDamage(1, 1);
-				if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+				if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 					if (tmp == 1)
 						smlayer_startSfx(50);
 				} else {
@@ -888,7 +888,7 @@
 				case INV_2X4:
 				case INV_BOOT:
 					tmp = calcEnemyDamage(1, 1);
-					if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+					if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 						if (tmp == 1)
 							smlayer_startSfx(52);
 						if (tmp == 1000)
@@ -1013,7 +1013,7 @@
 		smlayer_setActorFacing(0, 2, 19, 180);
 		_actor[0].act[2].state = 27;
 		_actor[0].act[2].tilt = calcTilt(_actor[0].tilt);
-		if (!((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)))
+		if (!((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)))
 			smlayer_startSfx(72);
 		break;
 	case 27:
@@ -1056,7 +1056,7 @@
 				case INV_BOOT:
 				case INV_DUST:
 					tmp = calcEnemyDamage(1, 1);
-					if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+					if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 						if (tmp == 1)
 							smlayer_startSfx(58);
 						if (tmp == 1000)
@@ -1175,7 +1175,7 @@
 	case 36:
 		smlayer_setActorLayer(0, 2, 5);
 		_actor[0].kicking = false;
-		if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+		if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))
 			smlayer_setActorCostume(0, 2, readArray(17));
 		else
 			smlayer_setActorCostume(0, 2, readArray(18));
@@ -1221,7 +1221,7 @@
 				case EN_ROTT1:
 				case EN_ROTT2:
 				case EN_ROTT3:
-					if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+					if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))
 						queueSceneSwitch(9, 0, "bencrshe.san", 64, 0, 0, 0);
 					else
 						queueSceneSwitch(9, 0, "wr2_benr.san", 64, 0, 0, 0);
@@ -1922,7 +1922,7 @@
 		_actor[0].act[2].state = 34;
 		break;
 	case INV_WRENCH:
-		if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+		if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))
 			smlayer_setActorCostume(0, 2, readArray(24));
 		else
 			smlayer_setActorCostume(0, 2, readArray(25));
@@ -1933,7 +1933,7 @@
 	case INV_BOOT:
 	case INV_HAND:
 	case INV_DUST:
-		if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+		if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))
 			smlayer_setActorCostume(0, 2, readArray(11));
 		else
 			smlayer_setActorCostume(0, 2, readArray(12));
@@ -1984,7 +1984,7 @@
 void Insane::ouchSoundBen(void) {
 	_actor[0].act[3].state = 52;
 
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 		smlayer_startVoice(54);
 		return;
 	}

Index: insane_enemy.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_enemy.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- insane_enemy.cpp	1 Jan 2005 16:09:18 -0000	1.17
+++ insane_enemy.cpp	20 Apr 2005 18:21:28 -0000	1.18
@@ -1265,7 +1265,7 @@
 
 	_actor[1].act[3].state = 52;
 
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 		smlayer_startVoice(55);
 		return;
 	}
@@ -1699,7 +1699,7 @@
 		_actor[1].weaponClass = 1;
 		if (_actor[1].act[2].frame >= 6) {
 			tmp = calcBenDamage(1, 1);
-			if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+			if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 				if (tmp == 1)
 					smlayer_startSfx(50);
 			} else if (tmp == 1)
@@ -1871,7 +1871,7 @@
 		smlayer_setActorFacing(1, 2, 19, 180);
 		_actor[1].act[2].state = 19;
 		_actor[1].act[2].tilt = calcTilt(_actor[1].tilt);
-		if (!((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) {
+		if (!((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))) {
 			smlayer_startSfx(69);
 			 if (!_actor[1].field_54) {
 				tmp = _vm->_rnd.getRandomNumber(4);
@@ -1935,7 +1935,7 @@
 			case INV_2X4:
 			case INV_BOOT:
 				tmp = calcBenDamage(1, 1);
-				if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+				if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 					if (tmp == 1)
 						smlayer_startSfx(52);
 					else if (tmp == 1000)
@@ -2053,7 +2053,7 @@
 		_actor[1].kicking = true;
 		if (_actor[1].act[2].frame >= 3) {
 			tmp = calcBenDamage(1, 1);
-			if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+			if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 				if (tmp == 1)
 					smlayer_startSfx(57);
 			} else if (tmp == 1)
@@ -2109,7 +2109,7 @@
 		smlayer_setActorLayer(1, 2, 25);
 		_actor[1].act[2].state = 37;
 
-		if (!((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) {
+		if (!((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))) {
 			smlayer_startSfx(96);
 			switch (_currEnemy) {
 			case EN_ROTT1:

Index: insane_iact.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_iact.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- insane_iact.cpp	1 Jan 2005 16:09:18 -0000	1.18
+++ insane_iact.cpp	20 Apr 2005 18:21:29 -0000	1.19
@@ -323,7 +323,7 @@
 					  int32 setupsan13, Chunk &b, int32 size, int32 flags) {
 	_player->checkBlock(b, TYPE_IACT, 8);
 
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))
 		return;
 
 	int16 par1, par2, par3, par4, par5;

Index: insane_scenes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_scenes.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- insane_scenes.cpp	1 Jan 2005 16:09:18 -0000	1.26
+++ insane_scenes.cpp	20 Apr 2005 18:21:29 -0000	1.27
@@ -67,14 +67,14 @@
 		break;
 	case 2:
 		setupValues();
-		if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+		if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))
 			smlayer_setActorCostume(0, 2, readArray(10));
 		else
 			smlayer_setActorCostume(0, 2, readArray(11));
 		smlayer_putActor(0, 2, _actor[0].x, _actor[0].y1 + 190, _smlayer_room2);
 
 		_mainRoadPos = readArray(2);
-		if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+		if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 			initScene(5);
 			startVideo("tovista.san", 1, 32, 12, 0);
 		} else if (_mainRoadPos == _posBrokenTruck) {
@@ -141,7 +141,7 @@
 
 	_insaneIsRunning = false;
 
-	if (!((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) {
+	if (!((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))) {
 		writeArray(50, _actor[0].inventory[INV_CHAIN]);
 		writeArray(51, _actor[0].inventory[INV_CHAINSAW]);
 		writeArray(52, _actor[0].inventory[INV_MACE]);
@@ -238,7 +238,7 @@
 		_actor[1].defunct = 0;
 		_actor[1].scenePropSubIdx = 0;
 		_actor[1].field_54 = 0;
-		if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+		if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 			smlayer_stopSound(59);
 			smlayer_stopSound(63);
 		} else {
@@ -314,7 +314,7 @@
 
 // insane_loadSceneData1 & insane_loadSceneData2
 int Insane::loadSceneData(int scene, int flag, int phase) {
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))
 		return 1;
 
 	int retvalue = 1;
@@ -648,7 +648,7 @@
 	case 4:
 	case 5:
 	case 6:
-		if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+		if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))
 			smlayer_setActorCostume(0, 2, readArray(10));
 		else
 			smlayer_setActorCostume(0, 2, readArray(11));
@@ -668,7 +668,7 @@
 
 	debugC(DEBUG_INSANE, "setEnemyCostumes(%d)", _currEnemy);
 
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC)) {
 		smlayer_setActorCostume(0, 2, readArray(11));
 		smlayer_setActorCostume(0, 0, readArray(13));
 		smlayer_setActorCostume(0, 1, readArray(12));
@@ -1132,7 +1132,7 @@
 
 void Insane::postCase3(byte *renderBitmap, int32 codecparam, int32 setupsan12,
 					   int32 setupsan13, int32 curFrame, int32 maxFrame) {
-	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+	if ((_vm->_features & GF_DEMO) && (_vm->_platform == Common::kPlatformPC))
 		turnBen(false);
 	else
 		turnBen(true);