From 7e66cbd468a5b89eaf170d5e0fb3bb312365628c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 26 Jun 2012 11:12:37 +0300
Subject: SCI: Rename a parameter in validateExportFunc()

This ensures that it won't be confused with a function with the same name
---
 engines/sci/engine/script.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/sci/engine/script.cpp')

diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 57334b89aa..d4143dcceb 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -385,7 +385,7 @@ void Script::setLockers(int lockers) {
 	_lockers = lockers;
 }
 
-uint32 Script::validateExportFunc(int pubfunct, bool relocateSci3) {
+uint32 Script::validateExportFunc(int pubfunct, bool relocSci3) {
 	bool exportsAreWide = (g_sci->_features->detectLofsType() == SCI_VERSION_1_MIDDLE);
 
 	if (_numExports <= pubfunct) {
@@ -401,7 +401,7 @@ uint32 Script::validateExportFunc(int pubfunct, bool relocateSci3) {
 	if (getSciVersion() != SCI_VERSION_3) {
 		offset = READ_SCI11ENDIAN_UINT16(_exportTable + pubfunct);
 	} else {
-		if (!relocateSci3)
+		if (!relocSci3)
 			offset = READ_SCI11ENDIAN_UINT16(_exportTable + pubfunct) + getCodeBlockOffsetSci3();
 		else
 			offset = relocateOffsetSci3(pubfunct * 2 + 22);
-- 
cgit v1.2.3


From cc7768869690261d0f6ee3fddc8f0800307813bb Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 28 Jun 2012 03:29:34 +0300
Subject: SCI: Remove an incorrect error check in validateExportFunc()

---
 engines/sci/engine/script.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'engines/sci/engine/script.cpp')

diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index d4143dcceb..037f4ab700 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -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");
-- 
cgit v1.2.3