diff options
| author | Filippos Karapetis | 2010-05-19 08:50:24 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-05-19 08:50:24 +0000 |
| commit | 174a043aa7459478326a771581d39f3480ca82f6 (patch) | |
| tree | 9c627a18dc95fd39c46f39d8cf8f2a81217a6e17 /engines/sci/engine/kscripts.cpp | |
| parent | 852cb16c49aaca1891d25e420ddf1459efa55ae8 (diff) | |
| download | scummvm-rg350-174a043aa7459478326a771581d39f3480ca82f6.tar.gz scummvm-rg350-174a043aa7459478326a771581d39f3480ca82f6.tar.bz2 scummvm-rg350-174a043aa7459478326a771581d39f3480ca82f6.zip | |
Removed the exportsAreWide variable from the segment manager and save games, and moved validateExportFunc() in the Script class, thus resolving a TODO
svn-id: r49093
Diffstat (limited to 'engines/sci/engine/kscripts.cpp')
| -rw-r--r-- | engines/sci/engine/kscripts.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp index 99cfe2c01f..ba29f64966 100644 --- a/engines/sci/engine/kscripts.cpp +++ b/engines/sci/engine/kscripts.cpp @@ -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) { |