libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 17:29:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wrote the initialization code for the exports and synonyms table to make more sense and fixed a bug with the initialization of the synonyms pointer, introduced with rev #49336

Browse Source 
svn-id: r49360
This commit is contained in:
Filippos Karapetis 2010-05-31 18:31:37 +00:00
parent 443c0d4f93
commit de2e935b2c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/sci/engine/segment.cpp
View File

@ -194,18 +194,21 @@ void Script::load(ResourceManager *resMan) {
_numSynonyms = 0;
if (getSciVersion() >= SCI_VERSION_1_1) {
if (READ_LE_UINT16(_buf + 6) > 0) {
_exportTable = (const uint16 *)(_buf + 6 + 2);
if (READ_LE_UINT16(_buf + 1 + 5) > 0) {
_exportTable = (const uint16 *)(_buf + 1 + 5 + 2);
_numExports = READ_SCI11ENDIAN_UINT16(_exportTable - 1);
}
} else {
_exportTable = (const uint16 *)findBlock(SCI_OBJ_EXPORTS);
if (_exportTable) {
_exportTable += 3;
_numExports = READ_SCI11ENDIAN_UINT16(_exportTable - 1);
_numExports = READ_SCI11ENDIAN_UINT16(_exportTable + 1);
_exportTable += 3; // skip header plus 2 bytes (_exportTable is a uint16 pointer)
}
_synonyms = findBlock(SCI_OBJ_SYNONYMS);
_numSynonyms = _synonyms ? READ_SCI11ENDIAN_UINT16(_synonyms - 2) / 4 : 0;
if (_synonyms) {
_numSynonyms = READ_SCI11ENDIAN_UINT16(_synonyms + 2) / 4;
_synonyms += 4; // skip header
}
}
}