diff options
| author | Filippos Karapetis | 2010-05-30 20:06:50 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-05-30 20:06:50 +0000 |
| commit | dc4d61f7181edf332d426bab9d16e0055e3d0f21 (patch) | |
| tree | ee1ea233302a6e4ca0b7ecf05922bf9192b1c219 /engines/sci/engine/segment.h | |
| parent | 9c2da78ba9a99145241025974c42219a673dd2a8 (diff) | |
| download | scummvm-rg350-dc4d61f7181edf332d426bab9d16e0055e3d0f21.tar.gz scummvm-rg350-dc4d61f7181edf332d426bab9d16e0055e3d0f21.tar.bz2 scummvm-rg350-dc4d61f7181edf332d426bab9d16e0055e3d0f21.zip | |
- Merged the SCI0 scriptRelocate() and SCI11 heapRelocate() functions inside relocate(). scriptRelocate checked one more relocation entry, which seems wrong, so we're now checking for the correct number of relocations in all SCI versions
- Re-added the error when script + heap exceed 64KB (better than an assert) - this should theoretically never happen, and it never has for the games tested
- Removed the relocated sanity check - again, it shouldn't occur (else something else is wrong)
svn-id: r49332
Diffstat (limited to 'engines/sci/engine/segment.h')
| -rw-r--r-- | engines/sci/engine/segment.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h index 127ab28b7e..7b0828ab6b 100644 --- a/engines/sci/engine/segment.h +++ b/engines/sci/engine/segment.h @@ -355,7 +355,6 @@ public: LocalVariables *_localsBlock; Common::Array<CodeBlock> _codeBlocks; - bool _relocated; bool _markedAsDeleted; public: @@ -409,9 +408,7 @@ public: * @param obj_pos Location (segment, offset) of the block * @return Location of the relocation block */ - void scriptRelocate(reg_t block); - - void heapRelocate(reg_t block); + void relocate(reg_t block); private: bool relocateLocal(SegmentId segment, int location); |