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

SCI: Merge setLockers(1) call into Script::init

Browse source 
svn-id: r49337
This commit is contained in:
Max Horn 2010-05-30 23:00:32 +00:00
parent a0ee93ece5
commit 4e25867a67
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -273,10 +273,6 @@ int script_instantiate_common(ResourceManager *resMan, SegManager *segMan, int s
scr->init(script_nr, resMan); scr->init(script_nr, resMan);
scr->load(resMan); scr->load(resMan);
// Set heap position (beyond the size word)
scr->setLockers(1);
*was_new = 0; *was_new = 0;
return seg_id; return seg_id;

2
engines/sci/engine/segment.cpp
View file

@ -135,6 +135,8 @@ void Script::init(int script_nr, ResourceManager *resMan) {
_bufSize = script->size; _bufSize = script->size;
_heapSize = 0; _heapSize = 0;
_lockers = 1;
if (getSciVersion() == SCI_VERSION_0_EARLY) { if (getSciVersion() == SCI_VERSION_0_EARLY) {
_bufSize += READ_LE_UINT16(script->data) * 2; _bufSize += READ_LE_UINT16(script->data) * 2;
} else if (getSciVersion() >= SCI_VERSION_1_1) { } else if (getSciVersion() >= SCI_VERSION_1_1) {