thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed the exportsAreWide variable from the segment manager and save games, and moved validateExportFunc() in the Script class, thus resolving a TODO

Browse source 
svn-id: r49093
This commit is contained in:
Filippos Karapetis 2010-05-19 08:50:24 +00:00
parent 852cb16c49
commit 174a043aa7
8 changed files with 27 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/sci/engine/vm.cpp
View file

@ -258,10 +258,12 @@ ExecStack *execute_method(EngineState *s, uint16 script, uint16 pubfunct, StackP
int seg = s->_segMan->getScriptSegment(script);
Script *scr = s->_segMan->getScriptIfLoaded(seg);
if (!scr || scr->isMarkedAsDeleted()) // Script not present yet?
if (!scr || scr->isMarkedAsDeleted()) { // Script not present yet?
seg = script_instantiate(g_sci->getResMan(), s->_segMan, script);
scr = s->_segMan->getScript(seg);
}
const int temp = s->_segMan->validateExportFunc(pubfunct, seg);
const int temp = scr->validateExportFunc(pubfunct);
if (!temp) {
#ifdef ENABLE_SCI32
// HACK: Temporarily switch to a warning in SCI32 games until we can figure out why Torin has