diff options
| author | Max Horn | 2010-05-30 23:00:32 +0000 |
|---|---|---|
| committer | Max Horn | 2010-05-30 23:00:32 +0000 |
| commit | 4e25867a671a8847b167decba1ed1e95cf699e66 (patch) | |
| tree | 90b52fb381bdec0f7112dc855beb80afa56562d1 | |
| parent | a0ee93ece52213cd989a50902281d917fe392ea4 (diff) | |
| download | scummvm-rg350-4e25867a671a8847b167decba1ed1e95cf699e66.tar.gz scummvm-rg350-4e25867a671a8847b167decba1ed1e95cf699e66.tar.bz2 scummvm-rg350-4e25867a671a8847b167decba1ed1e95cf699e66.zip | |
SCI: Merge setLockers(1) call into Script::init
svn-id: r49337
| -rw-r--r-- | engines/sci/engine/script.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/segment.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 793f78e030..07fc75596e 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -273,10 +273,6 @@ int script_instantiate_common(ResourceManager *resMan, SegManager *segMan, int s scr->init(script_nr, resMan); scr->load(resMan); - // Set heap position (beyond the size word) - scr->setLockers(1); - - *was_new = 0; return seg_id; diff --git a/engines/sci/engine/segment.cpp b/engines/sci/engine/segment.cpp index 3653ff4ae9..3bec74398c 100644 --- a/engines/sci/engine/segment.cpp +++ b/engines/sci/engine/segment.cpp @@ -135,6 +135,8 @@ void Script::init(int script_nr, ResourceManager *resMan) { _bufSize = script->size; _heapSize = 0; + _lockers = 1; + if (getSciVersion() == SCI_VERSION_0_EARLY) { _bufSize += READ_LE_UINT16(script->data) * 2; } else if (getSciVersion() >= SCI_VERSION_1_1) { |