[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.35,1.36 insane_ben.cpp,1.13,1.14

Travis Howell kirben at users.sourceforge.net
Fri Aug 6 03:05:00 CEST 2004


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

Modified Files:
	insane.cpp insane_ben.cpp 
Log Message:

More PC FT demo INSANE differences (Weapons)


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- insane.cpp	6 Aug 2004 09:27:53 -0000	1.35
+++ insane.cpp	6 Aug 2004 10:03:49 -0000	1.36
@@ -176,7 +176,7 @@
 
 	
 	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
-		init_enemyStruct(EN_ROTT1, EN_ROTT1, 0, 0, 160, 0, INV_MACE, 90, "endcrshr.san", 
+		init_enemyStruct(EN_ROTT1, EN_ROTT1, 0, 0, 160, 0, INV_MACE, 63, "endcrshr.san", 
 						 25, 16, 15, 27, 11, 3);
 	} else {
 		init_enemyStruct(EN_ROTT1, EN_ROTT1, 0, 0, 160, 0, INV_MACE, 90, "wr2_rott.san", 
@@ -385,11 +385,11 @@
 	_actor[0].inventory[INV_CHAINSAW] = 0;
 	_actor[0].inventory[INV_MACE] = 0;
 	_actor[0].inventory[INV_2X4] = 0;
+	_actor[0].inventory[INV_WRENCH] = 1;
 	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
-		_actor[0].inventory[INV_WRENCH] = 0;
+		_actor[0].inventory[INV_BOOT] = 0;
 	else
-		_actor[0].inventory[INV_WRENCH] = 1;
-	_actor[0].inventory[INV_BOOT] = 1;
+		_actor[0].inventory[INV_BOOT] = 1;
 	_actor[0].inventory[INV_HAND] = 1;
 	_actor[0].inventory[INV_DUST] = 0;
 	_actor[0].probability = 5;

Index: insane_ben.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_ben.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- insane_ben.cpp	5 Aug 2004 05:35:43 -0000	1.13
+++ insane_ben.cpp	6 Aug 2004 10:03:49 -0000	1.14
@@ -1928,7 +1928,10 @@
 		_actor[0].act[2].state = 34;
 		break;
 	case INV_WRENCH:
-		smlayer_setActorCostume(0, 2, readArray(25));
+		if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))
+			smlayer_setActorCostume(0, 2, readArray(24));
+		else
+			smlayer_setActorCostume(0, 2, readArray(25));
 		smlayer_setActorFacing(0, 2, 18, 180);
 		_actor[0].weaponClass = 0;
 		_actor[0].act[2].state = 34;
@@ -1936,9 +1939,13 @@
 	case INV_BOOT:
 	case INV_HAND:
 	case INV_DUST:
-		smlayer_setActorCostume(0, 2, readArray(12));
-		_actor[0].weaponClass = 2;
-		_actor[0].act[2].state = 1;
+		if (!((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) {
+			smlayer_setActorCostume(0, 2, readArray(12));
+			_actor[0].weaponClass = 2;
+			_actor[0].act[2].state = 1;
+		} else {
+			smlayer_setActorCostume(0, 2, readArray(21));
+		}
 		break;
 	default:
 		break;





More information about the Scummvm-git-logs mailing list