libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-30 05:34:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reduce code duplication

Browse Source 
svn-id: r15908
This commit is contained in:
Max Horn 2004-11-27 13:10:41 +00:00
parent 6bcb1ce7d9
commit dce059eebf
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scumm/resource.cpp
View File

@ -1958,35 +1958,20 @@ byte *ScummEngine::getResourceAddress(int type, int idx) {
}
byte *ScummEngine::getStringAddress(int i) {
byte *b = getResourceAddress(rtString, i);
if (!b)
byte *addr = getResourceAddress(rtString, i);
if (addr == NULL)
return NULL;
if (_heversion >= 72)
return (b + 0x14); // ArrayHeader->data
return (addr + 0x14); // ArrayHeader->data
if (_features & GF_NEW_OPCODES)
return ((ArrayHeader *)b)->data;
return b;
return (addr + 0x6); // ArrayHeader->data
return addr;
}
byte *ScummEngine::getStringAddressVar(int i) {
byte *addr;
addr = getResourceAddress(rtString, _scummVars[i]);
if (addr == NULL)
// as this is used for string mapping in the gui
// it must be allowed to return NULL
// error("NULL string var %d slot %d", i, _scummVars[i]);
return NULL;
if (_heversion >= 72)
return (addr + 0x14); // ArrayHeader->data
if (_features & GF_NEW_OPCODES)
return ((ArrayHeader *)addr)->data;
return (addr);
return getStringAddress(_scummVars[i]);
}
void ScummEngine::setResourceCounter(int type, int idx, byte flag) {