thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved setScriptSize() inside Script::init(), and removed a FIXME - the SCI1.1 word-align is done inside Script::init()

Browse source 
svn-id: r49330
This commit is contained in:
Filippos Karapetis 2010-05-30 18:45:07 +00:00
parent 29c2f30558
commit 016862ac3a
4 changed files with 23 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/sci/engine/script.cpp
View file

@ -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)));