[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.59,1.60

[Eugene Sandulenko]

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

Modified Files:
	insane.cpp 
Log Message:
Possible fix for #1210373 FT: "wrong INSANE parameters for EN_VULTF2"


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- insane.cpp	8 May 2005 21:18:27 -0000	1.59
+++ insane.cpp	28 May 2005 13:10:08 -0000	1.60
@@ -674,14 +674,21 @@
 		_enemy[EN_VULTF2].isEmpty = readArray(339);
 		_enemy[EN_CAVEFISH].isEmpty = readArray(56);
 
+		// FIXME
 		// Some sanity checks. There were submitted savefiles where these values were wrong
-		if (_enemy[EN_VULTM2].isEmpty != readArray(7))
-			error("Wrong INSANE parameters for EN_VULTM2 (%d %d). Please, report this", 
+		// 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)", 
 				  _enemy[EN_VULTM2].isEmpty, readArray(7));
+			_enemy[EN_VULTM2].isEmpty = readArray(7);
+		}
 
-		if (_enemy[EN_VULTF2].isEmpty != (_actor[0].inventory[INV_CHAINSAW] != 0))
-			error("Wrong INSANE parameters for EN_VULTF2 (%d %d). Please, report this", 
+		if (_enemy[EN_VULTF2].isEmpty != (_actor[0].inventory[INV_CHAINSAW] != 0)) {
+			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);
+		}
 
 		// FIXME
 		// This used to be here but.