[Scummvm-cvs-logs] SF.net SVN: scummvm:[49337] scummvm/trunk/engines/sci/engine
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon May 31 01:00:32 CEST 2010
Revision: 49337
http://scummvm.svn.sourceforge.net/scummvm/?rev=49337&view=rev
Author: fingolfin
Date: 2010-05-30 23:00:32 +0000 (Sun, 30 May 2010)
Log Message:
-----------
SCI: Merge setLockers(1) call into Script::init
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/script.cpp
scummvm/trunk/engines/sci/engine/segment.cpp
Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp 2010-05-30 21:49:07 UTC (rev 49336)
+++ scummvm/trunk/engines/sci/engine/script.cpp 2010-05-30 23:00:32 UTC (rev 49337)
@@ -273,10 +273,6 @@
scr->init(script_nr, resMan);
scr->load(resMan);
- // Set heap position (beyond the size word)
- scr->setLockers(1);
-
-
*was_new = 0;
return seg_id;
Modified: scummvm/trunk/engines/sci/engine/segment.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/segment.cpp 2010-05-30 21:49:07 UTC (rev 49336)
+++ scummvm/trunk/engines/sci/engine/segment.cpp 2010-05-30 23:00:32 UTC (rev 49337)
@@ -135,6 +135,8 @@
_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) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list