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

[thebluegr at users.sourceforge.net]

Revision: 50379
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50379&view=rev
Author:   thebluegr
Date:     2010-06-27 16:02:03 +0000 (Sun, 27 Jun 2010)

Log Message:
-----------
Turned the error when failing to locate an invalid object back to a warning (KQ5 French has an invalid object in script 202)

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-27 15:50:51 UTC (rev 50378)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2010-06-27 16:02:03 UTC (rev 50379)
@@ -224,8 +224,9 @@
 					obj->initSpecies(this, addr);
 
 					if (!obj->initBaseObject(this, addr)) {
-						error("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr));
-						//scr->scriptObjRemove(addr);
+						// Script 202 of KQ5 French has an invalid object
+						warning("Failed to locate base object for object at %04X:%04X; skipping", PRINT_REG(addr));
+						scr->scriptObjRemove(addr);
 					}
 				}
 				break;


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