1 files changed, 15 insertions, 10 deletions

diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp
index 897ceccad3..037f4ab700 100644
--- a/engines/sci/engine/script.cpp
+++ b/engines/sci/engine/script.cpp
@@ -385,7 +385,7 @@ void Script::setLockers(int lockers) {
 	_lockers = lockers;
 }
 
-uint16 Script::validateExportFunc(int pubfunct, bool relocate) {
+uint32 Script::validateExportFunc(int pubfunct, bool relocSci3) {
 	bool exportsAreWide = (g_sci->_features->detectLofsType() == SCI_VERSION_1_MIDDLE);
 
 	if (_numExports <= pubfunct) {
@@ -396,17 +396,17 @@ uint16 Script::validateExportFunc(int pubfunct, bool relocate) {
 	if (exportsAreWide)
 		pubfunct *= 2;
 
-	uint16 offset;
+	uint32 offset;
 
-	if (getSciVersion() != SCI_VERSION_3 || !relocate) {
+	if (getSciVersion() != SCI_VERSION_3) {
 		offset = READ_SCI11ENDIAN_UINT16(_exportTable + pubfunct);
 	} else {
-		offset = relocateOffsetSci3(pubfunct * 2 + 22);
+		if (!relocSci3)
+			offset = READ_SCI11ENDIAN_UINT16(_exportTable + pubfunct) + getCodeBlockOffsetSci3();
+		else
+			offset = relocateOffsetSci3(pubfunct * 2 + 22);
 	}
 
-	if (offset >= _bufSize)
-		error("Invalid export function pointer");
-
 	// Check if the offset found points to a second export table (e.g. script 912
 	// in Camelot and script 306 in KQ4). Such offsets are usually small (i.e. < 10),
 	// thus easily distinguished from actual code offsets.
@@ -419,11 +419,16 @@ uint16 Script::validateExportFunc(int pubfunct, bool relocate) {
 		if (secondExportTable) {
 			secondExportTable += 3;	// skip header plus 2 bytes (secondExportTable is a uint16 pointer)
 			offset = READ_SCI11ENDIAN_UINT16(secondExportTable + pubfunct);
-			if (offset >= _bufSize)
-				error("Invalid export function pointer");
 		}
 	}
 
+	// 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");
+
 	return offset;
 }
 
@@ -551,7 +556,7 @@ void Script::initializeClasses(SegManager *segMan) {
 		if (getSciVersion() <= SCI_VERSION_1_LATE && !marker)
 			break;
 
-		if (getSciVersion() >= SCI_VERSION_1_1 && marker != 0x1234)
+		if (getSciVersion() >= SCI_VERSION_1_1 && marker != SCRIPT_OBJECT_MAGIC_NUMBER)
 			break;
 
 		if (getSciVersion() <= SCI_VERSION_1_LATE) {