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

SCI3: Add proper support for the calle instruction

Browse source 
svn-id: r54327
This commit is contained in:
Lars Skovlund 2010-11-18 17:04:00 +00:00
parent 152e52d015
commit c5252071db
4 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -398,7 +398,7 @@ void Script::setLockers(int lockers) {
_lockers = lockers;
}
uint16 Script::validateExportFunc(int pubfunct) {
uint16 Script::validateExportFunc(int pubfunct, bool relocate) {
bool exportsAreWide = (g_sci->_features->detectLofsType() == SCI_VERSION_1_MIDDLE);
if (_numExports <= pubfunct) {
@ -408,8 +408,15 @@ uint16 Script::validateExportFunc(int pubfunct) {
if (exportsAreWide)
pubfunct *= 2;
uint16 offset = getSciVersion() != SCI_VERSION_3 ? READ_SCI11ENDIAN_UINT16(_exportTable + pubfunct) :
relocateOffsetSci3(pubfunct * 2 + 22);
uint16 offset;
if (getSciVersion() != SCI_VERSION_3 || !relocate) {
offset = READ_SCI11ENDIAN_UINT16(_exportTable + pubfunct);
} else {
offset = relocateOffsetSci3(pubfunct * 2 + 22);
}
VERIFY(offset < _bufSize, "invalid export function pointer");
// Check if the offset found points to a second export table (e.g. script 912