[Scummvm-cvs-logs] SF.net SVN: scummvm:[50427] scummvm/trunk/engines/sci/engine/script.cpp

[fingolfin at users.sourceforge.net]

Revision: 50427
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50427&view=rev
Author:   fingolfin
Date:     2010-06-28 11:21:55 +0000 (Mon, 28 Jun 2010)

Log Message:
-----------
SCI: Change warning back to error in Script::initialiseObjectsSci0

Instead of turning the error into a warning globally, we now have
code which ignores the error in Script 202 of KQ5 French, but will
keep reporting if it turns up in other places.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/script.cpp

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2010-06-28 11:21:39 UTC (rev 50426)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2010-06-28 11:21:55 UTC (rev 50427)
@@ -471,8 +471,11 @@
 				obj->initSpecies(segMan, addr);
 
 				if (!obj->initBaseObject(segMan, addr)) {
-					// Script 202 of KQ5 French has an invalid object. This is non-fatal.
-					warning("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr));
+					if (_nr == 202 && g_sci->getGameId() == GID_KQ5 && g_sci->getSciLanguage() == K_LANG_FRENCH) {
+						// Script 202 of KQ5 French has an invalid object. This is non-fatal.
+					} else {
+						error("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr));
+					}
 					scriptObjRemove(addr);
 				}
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.