[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.49,1.50

Eugene Sandulenko sev at users.sourceforge.net
Mon Oct 11 03:01:04 CEST 2004


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

Modified Files:
	insane.cpp 
Log Message:
Fix bug #1044074. Check which triggered the error is too strict, so
disable it.


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- insane.cpp	28 Sep 2004 19:28:59 -0000	1.49
+++ insane.cpp	11 Oct 2004 09:47:07 -0000	1.50
@@ -681,9 +681,20 @@
 			error("Wrong INSANE parameters for EN_VULTF2 (%d %d). Please, report this", 
 				  _enemy[EN_VULTF2].isEmpty, _actor[0].inventory[INV_CHAINSAW]);
 
-		if (_enemy[EN_CAVEFISH].isEmpty != readArray(8))
-			error("Wrong INSANE parameters for EN_CAVEFISH (%d %d). Please, report this", 
-				  _enemy[EN_CAVEFISH].isEmpty, readArray(8));
+		// FIXME
+		// This used to be here but.
+		//  - bootparam 551 gives googles without cavefish met
+		//  - when you get the ramp, googles disappear, but you already won the cavefish
+		// Incorrect situation would be
+		//  you won cavefish, don't have googles, don't have ramp
+		//
+		// So if you find out what how to check ramp presense, feel free to add check here
+		// (beware of FT ver a and ver b. In version b var311 is inserted and all vars >311 
+		// are shifted),
+		// 
+		//if (_enemy[EN_CAVEFISH].isEmpty != readArray(8))
+		//	error("Wrong INSANE parameters for EN_CAVEFISH (%d %d). Please, report this", 
+		//		  _enemy[EN_CAVEFISH].isEmpty, readArray(8));
 	}
 }
 





More information about the Scummvm-git-logs mailing list