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

SCI: Remove an incorrect error check in validateExportFunc()

Browse source
This commit is contained in:
Filippos Karapetis 2012-06-28 03:29:34 +03:00
parent 12b8534e2f
commit cc77688696
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -422,16 +422,9 @@ uint32 Script::validateExportFunc(int pubfunct, bool relocSci3) {
}
}
if (!offset) {
#ifdef ENABLE_SCI32
// WORKAROUNDS for invalid (empty) exports
if (g_sci->getGameId() == GID_TORIN && _nr == 64036) {
} else if (g_sci->getGameId() == GID_RAMA && _nr == 64908) {
} else
#endif
error("Request for invalid exported function 0x%x of script %d", pubfunct, _nr);
return NULL;
}
// Note that it's perfectly normal to return a zero offset, especially in
// SCI1.1 and newer games. Examples include script 64036 in Torin's Passage,
// script 64908 in the demo of RAMA and script 1013 in KQ6 floppy.
if (offset >= _bufSize)
error("Invalid export function pointer");