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

Unified the script loading code, and marked an issue with the SCI11 heap addresses

Browse source 
svn-id: r49329
This commit is contained in:
Filippos Karapetis 2010-05-30 17:02:21 +00:00
parent 5cdb13b3e8
commit 29c2f30558
2 changed files with 21 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,15 +120,6 @@ void Script::freeScript() {
bool Script::init(int script_nr, ResourceManager *resMan) {
setScriptSize(script_nr, resMan);
_buf = (byte *)malloc(_bufSize);
if (!_buf) {
freeScript();
warning("Not enough memory space for script size");
_bufSize = 0;
return false;
}
_localsOffset = 0;
_localsBlock = NULL;
@ -138,11 +129,8 @@ bool Script::init(int script_nr, ResourceManager *resMan) {
_markedAsDeleted = false;
_nr = script_nr;
if (getSciVersion() >= SCI_VERSION_1_1)
_heapStart = _buf + _scriptSize;
else
_heapStart = _buf;
_buf = 0;
_heapStart = 0;
return true;
}