diff options
| author | Max Horn | 2009-09-06 12:58:16 +0000 |
|---|---|---|
| committer | Max Horn | 2009-09-06 12:58:16 +0000 |
| commit | fdbb167ea3962bb9202c81af37da4ee4955f4626 (patch) | |
| tree | b9ddb9c51da98157ed1541e36271c25ba540d03f /engines/sci/engine/savegame.cpp | |
| parent | d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3 (diff) | |
| download | scummvm-rg350-fdbb167ea3962bb9202c81af37da4ee4955f4626.tar.gz scummvm-rg350-fdbb167ea3962bb9202c81af37da4ee4955f4626.tar.bz2 scummvm-rg350-fdbb167ea3962bb9202c81af37da4ee4955f4626.zip | |
SCI: Cleanup for some SegManager internals
- rename segGet and getSegment to getScriptSegment; the two can be
distinguished by the parameter count.
- rename type SCRIPT_GET to ScriptLoadType to conform with our code
formatting conventions
- rename get_class_address to getClassAddress
- some cleanup
svn-id: r43981
Diffstat (limited to 'engines/sci/engine/savegame.cpp')
| -rw-r--r-- | engines/sci/engine/savegame.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index 96343cb300..70a39f32fd 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -714,7 +714,7 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) { reconstruct_scripts(retval, retval->segMan); retval->segMan->reconstructClones(); retval->game_obj = s->game_obj; - retval->script_000 = retval->segMan->getScript(retval->segMan->getSegment(0, SCRIPT_GET_DONT_LOAD)); + retval->script_000 = retval->segMan->getScript(retval->segMan->getScriptSegment(0, SCRIPT_GET_DONT_LOAD)); retval->gc_countdown = GC_INTERVAL - 1; retval->sys_strings_segment = retval->segMan->findSegmentByType(MEM_OBJ_SYS_STRINGS); retval->sys_strings = (SystemStrings *)GET_SEGMENT(*retval->segMan, retval->sys_strings_segment, MEM_OBJ_SYS_STRINGS); |