[Scummvm-git-logs] scummvm master -> 5cba33c0526120d46b73531328d54d6f88c73201

dreammaster dreammaster at scummvm.org
Mon Apr 16 13:41:16 CEST 2018


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c92561cd61 XEEN: Fix Swords scripts using cmdReturn instead of cmdExit
5cba33c052 XEEN: Add script patch for chest in Swords Hart


Commit: c92561cd614616924d5c82b6d8d5a0ac7fff215a
    https://github.com/scummvm/scummvm/commit/c92561cd614616924d5c82b6d8d5a0ac7fff215a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-16T07:37:49-04:00

Commit Message:
XEEN: Fix Swords scripts using cmdReturn instead of cmdExit

Changed paths:
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index dfd5c21..81ba0ca 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1048,11 +1048,16 @@ bool Scripts::cmdCallEvent(ParamsIterator &params) {
 }
 
 bool Scripts::cmdReturn(ParamsIterator &params) {
-	StackEntry se = _stack.pop();
-	_currentPos = se;
-	_lineNum = se.line;
+	if (_stack.empty()) {
+		// WORKAROUND: Some scripts in Swords of Xeen use cmdReturn as a substitute for cmdExit
+		return cmdExit(params);
+	} else {
+		StackEntry se = _stack.pop();
+		_currentPos = se;
+		_lineNum = se.line;
 
-	return true;
+		return true;
+	}
 }
 
 bool Scripts::cmdSetVar(ParamsIterator &params) {


Commit: 5cba33c0526120d46b73531328d54d6f88c73201
    https://github.com/scummvm/scummvm/commit/5cba33c0526120d46b73531328d54d6f88c73201
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-16T07:40:59-04:00

Commit Message:
XEEN: Add script patch for chest in Swords Hart

Changed paths:
    engines/xeen/patcher.cpp


diff --git a/engines/xeen/patcher.cpp b/engines/xeen/patcher.cpp
index 384b90e..280724c 100644
--- a/engines/xeen/patcher.cpp
+++ b/engines/xeen/patcher.cpp
@@ -35,11 +35,13 @@ struct ScriptEntry {
 	const byte *_data;
 };
 
-const byte MAP54_LINE8[] = { 8, 10, 10, DIR_EAST, 8, OP_MoveWallObj, 20, 100, 100 };
+const byte DS_MAP54_LINE8[] = { 8, 10, 10, DIR_EAST, 8, OP_MoveWallObj, 20, 100, 100 };
+const byte SW_MAP53_LINE8[] = { 5, 14, 6, DIR_EAST, 8, OP_Exit };
 
-#define SCRIPT_PATCHES_COUNT 1
+#define SCRIPT_PATCHES_COUNT 2
 static const ScriptEntry SCRIPT_PATCHES[] = {
-	{ GType_DarkSide, 54, MAP54_LINE8 }
+	{ GType_DarkSide, 54, DS_MAP54_LINE8 },	// Fix curtain on level 2 of Ellinger's Tower
+	{ GType_Swords, 53, SW_MAP53_LINE8 }	// Fix chest in Hart having gems, but saying "Nothing Here"
 };
 
 /*------------------------------------------------------------------------*/





More information about the Scummvm-git-logs mailing list