diff options
| author | Filippos Karapetis | 2010-08-05 16:58:59 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-08-05 16:58:59 +0000 |
| commit | 19e624ae5be72bfe1dc677911d656871737dd371 (patch) | |
| tree | bc1cf595f9bab0f65128e20501a1cb9a69067818 /engines | |
| parent | 9cd333152b763a109cf5b88af508678c1ea3fba7 (diff) | |
| download | scummvm-rg350-19e624ae5be72bfe1dc677911d656871737dd371.tar.gz scummvm-rg350-19e624ae5be72bfe1dc677911d656871737dd371.tar.bz2 scummvm-rg350-19e624ae5be72bfe1dc677911d656871737dd371.zip | |
SCI: Changed the warning when a script can't be found from a segment into an error
svn-id: r51758
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/vm.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 7f6d6cfd82..35fc3ca566 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -933,11 +933,7 @@ void run_vm(EngineState *s) { 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) |