diff options
| author | Filippos Karapetis | 2010-05-30 18:45:07 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-05-30 18:45:07 +0000 |
| commit | 016862ac3a4928529d9eaedf6edf3e916c89155c (patch) | |
| tree | 99d7cca38a0dfa5eebc3bcf465d86ff7922348de /engines/sci/engine/script.cpp | |
| parent | 29c2f30558e9c40d5c1a76ab600611b21ee72851 (diff) | |
| download | scummvm-rg350-016862ac3a4928529d9eaedf6edf3e916c89155c.tar.gz scummvm-rg350-016862ac3a4928529d9eaedf6edf3e916c89155c.tar.bz2 scummvm-rg350-016862ac3a4928529d9eaedf6edf3e916c89155c.zip | |
Moved setScriptSize() inside Script::init(), and removed a FIXME - the SCI1.1 word-align is done inside Script::init()
svn-id: r49330
Diffstat (limited to 'engines/sci/engine/script.cpp')
| -rw-r--r-- | engines/sci/engine/script.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index d52cdd693b..99a567d1e7 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -437,13 +437,6 @@ int script_instantiate_sci11(ResourceManager *resMan, SegManager *segMan, int sc scr->setExportTableOffset(6); int heapStart = scr->getScriptSize(); - - // FIXME: This code was used to ensure that the heap address is word-aligned - // Make sure that this is used in all places where the heap is referenced, - // not just here... - //if (heapStart & 2) - // heapStart++; - segMan->scriptInitialiseLocals(make_reg(seg_id, heapStart + 4)); segMan->scriptInitialiseObjectsSci11(seg_id); scr->heapRelocate(make_reg(seg_id, READ_SCI11ENDIAN_UINT16(scr->_heapStart))); |