[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.40,1.41

Travis Howell kirben at users.sourceforge.net
Sat Aug 7 02:20:03 CEST 2004


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

Modified Files:
	insane.cpp 
Log Message:

Always clear weapons in INSANE of PC FT demo


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- insane.cpp	7 Aug 2004 07:40:39 -0000	1.40
+++ insane.cpp	7 Aug 2004 09:18:41 -0000	1.41
@@ -385,10 +385,7 @@
 	_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_BOOT] = 0;
-	else
-		_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;
@@ -632,7 +629,17 @@
 
 void Insane::readState(void) { // PATCH
 
-	if (!((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC))) {
+	if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) {
+		_actor[0].inventory[INV_CHAIN] = 0;
+		_actor[0].inventory[INV_CHAINSAW] = 0;
+		_actor[0].inventory[INV_MACE] = 0;
+		_actor[0].inventory[INV_2X4] = 0;
+		_actor[0].inventory[INV_WRENCH] = 1;
+		_actor[0].inventory[INV_DUST] = 0;
+		_actor[0].inventory[INV_HAND] = 1;
+		_actor[0].inventory[INV_BOOT] = 0;
+		_smlayer_room2 = 13;
+	} else {
 		_actor[0].inventory[INV_CHAIN] = readArray(50) != 0;
 		_actor[0].inventory[INV_CHAINSAW] = readArray(51) != 0;
 		_actor[0].inventory[INV_MACE] = readArray(52) != 0;
@@ -662,8 +669,6 @@
 		_enemy[EN_CAVEFISH].occurences = readArray(336);
 		_enemy[EN_VULTM2].field_10 = readArray(340);
 		_enemy[EN_VULTF2].field_10 = readArray(339);
-	} else {
-		_smlayer_room2 = 13;
 	}
 }
 





More information about the Scummvm-git-logs mailing list