diff options
author | Andrew Kurushin | 2010-10-22 23:13:17 +0000 |
---|---|---|
committer | Andrew Kurushin | 2010-10-22 23:13:17 +0000 |
commit | f24394b85f5d34815659c50cd956c262f4b79d68 (patch) | |
tree | 8c93e3f052133b154b1686e00b4066b3967f0c02 /engines/saga/sthread.cpp | |
parent | b8ff3eb4913dd22bc75ae360baadadd95151077f (diff) | |
download | scummvm-rg350-f24394b85f5d34815659c50cd956c262f4b79d68.tar.gz scummvm-rg350-f24394b85f5d34815659c50cd956c262f4b79d68.tar.bz2 scummvm-rg350-f24394b85f5d34815659c50cd956c262f4b79d68.zip |
SAGA: replace Actor::_pathCell, Anim::*, Converse::text, IsoMap::*, Music::_songTable, ObjectMap::*, PalAnim::*, Scene::sceneLut, SndRes::_fxTable* malloc based arrays with Common::Array implementation
add ByteArray type
fix debug Tile Hittest frame drawing
debug 0x%x => 0x%X
svn-id: r53719
Diffstat (limited to 'engines/saga/sthread.cpp')
-rw-r--r-- | engines/saga/sthread.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/saga/sthread.cpp b/engines/saga/sthread.cpp index 1e0fe52618..098970f4e8 100644 --- a/engines/saga/sthread.cpp +++ b/engines/saga/sthread.cpp @@ -47,9 +47,9 @@ ScriptThread &Script::createThread(uint16 scriptModuleNumber, uint16 scriptEntry _threadList.push_front(tmp); ScriptThread &newThread = _threadList.front(); newThread._instructionOffset = _modules[scriptModuleNumber].entryPoints[scriptEntryPointNumber].offset; - newThread._commonBase = &_commonBuffer.front(); - newThread._staticBase = &_commonBuffer.front() + _modules[scriptModuleNumber].staticOffset; - newThread._moduleBase = &_modules[scriptModuleNumber].moduleBase.front(); + newThread._commonBase = _commonBuffer.getBuffer(); + newThread._staticBase = _commonBuffer.getBuffer() + _modules[scriptModuleNumber].staticOffset; + newThread._moduleBase = _modules[scriptModuleNumber].moduleBase.getBuffer(); newThread._moduleBaseSize = _modules[scriptModuleNumber].moduleBase.size(); newThread._strings = &_modules[scriptModuleNumber].strings; @@ -209,7 +209,7 @@ bool Script::runThread(ScriptThread &thread) { savedInstructionOffset = thread._instructionOffset; operandChar = scriptS.readByte(); - debug(8, "Executing thread offset: %u (%x) stack: %d", thread._instructionOffset, operandChar, thread.pushedSize()); + debug(8, "Executing thread offset: %u (0x%X) stack: %d", thread._instructionOffset, operandChar, thread.pushedSize()); stopParsing = false; debug(4, "Calling op %s", this->_scriptOpsList[operandChar].scriptOpName); |