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

5
engines/sci/engine/kscripts.cpp
View file

@ -187,12 +187,11 @@ reg_t kScriptID(EngineState *s, int argc, reg_t *argv) {
return argv[0];
SegmentId scriptSeg = s->_segMan->getScriptSegment(script, SCRIPT_GET_LOAD);
Script *scr;
if (!scriptSeg)
return NULL_REG;
scr = s->_segMan->getScript(scriptSeg);
Script *scr = s->_segMan->getScript(scriptSeg);
if (!scr->_numExports) {
// FIXME: Is this fatal? This occurs in SQ4CD
@ -205,7 +204,7 @@ reg_t kScriptID(EngineState *s, int argc, reg_t *argv) {
return NULL_REG;
}
return make_reg(scriptSeg, s->_segMan->validateExportFunc(index, scriptSeg));
return make_reg(scriptSeg, scr->validateExportFunc(index));
}
reg_t kDisposeScript(EngineState *s, int argc, reg_t *argv) {