aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Snover2017-04-18 11:44:18 -0500
committerColin Snover2017-04-23 13:07:25 -0500
commit28a06656af8e67219055cc8bbee57fa49dc2de61 (patch)
treef3fd9b1a05bdfa14c2866a97ef3414b00137b953
parentd53f3f6095975405558c2902a870ff3fa8c01a8b (diff)
downloadscummvm-rg350-28a06656af8e67219055cc8bbee57fa49dc2de61.tar.gz
scummvm-rg350-28a06656af8e67219055cc8bbee57fa49dc2de61.tar.bz2
scummvm-rg350-28a06656af8e67219055cc8bbee57fa49dc2de61.zip
SCI: Improve error messages in Script::validateExportFunc
-rw-r--r--engines/sci/engine/script.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 0a2d7e5ef4..d35cb5b570 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -798,8 +798,7 @@ uint32 Script::validateExportFunc(int pubfunct, bool relocSci3) {
bool exportsAreWide = (g_sci->_features->detectLofsType() == SCI_VERSION_1_MIDDLE);
if (_numExports <= (uint)pubfunct) {
- error("validateExportFunc(): pubfunct is invalid");
- return 0;
+ error("script.%d validateExportFunc(): pubfunct %d is invalid", _nr, pubfunct);
}
if (exportsAreWide)
@@ -829,7 +828,7 @@ uint32 Script::validateExportFunc(int pubfunct, bool relocSci3) {
}
if (offset == -1 || offset >= (int)_buf->size())
- error("Invalid export function pointer");
+ error("Invalid export %d function pointer (%d) in script.%d", pubfunct, offset, _nr);
return offset;
}