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

[thebluegr at users.sourceforge.net]

Revision: 51758
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51758&view=rev
Author:   thebluegr
Date:     2010-08-05 16:58:59 +0000 (Thu, 05 Aug 2010)

Log Message:
-----------
SCI: Changed the warning when a script can't be found from a segment into an error

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

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-08-05 14:41:00 UTC (rev 51757)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-08-05 16:58:59 UTC (rev 51758)
@@ -933,11 +933,7 @@
 			obj = s->_segMan->getObject(s->xs->objp);
 			local_script = s->_segMan->getScriptIfLoaded(s->xs->local_segment);
 			if (!local_script) {
-				// FIXME: Why does this happen? Is the script not loaded yet at this point?
-				warning("Could not find local script from segment %x", s->xs->local_segment);
-				local_script = NULL;
-				s->variablesBase[VAR_LOCAL] = s->variables[VAR_LOCAL] = NULL;
-				s->variablesMax[VAR_LOCAL] = 0;
+				error("Could not find local script from segment %x", s->xs->local_segment);
 			} else {
 				s->variablesSegment[VAR_LOCAL] = local_script->_localsSegment;
 				if (local_script->_localsBlock)


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