[Scummvm-git-logs] scummvm master -> a38e16b9638aa0d35ec42220ab6825e6925b23b2

dreammaster dreammaster at scummvm.org
Sun Apr 15 13:45:17 CEST 2018


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

Summary:
a38e16b963 XEEN: Fix opening of Ali Baba's chest


Commit: a38e16b9638aa0d35ec42220ab6825e6925b23b2
    https://github.com/scummvm/scummvm/commit/a38e16b9638aa0d35ec42220ab6825e6925b23b2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-15T07:43:51-04:00

Commit Message:
XEEN: Fix opening of Ali Baba's chest

Changed paths:
    engines/xeen/party.cpp


diff --git a/engines/xeen/party.cpp b/engines/xeen/party.cpp
index 3ee991d..cbf8489 100644
--- a/engines/xeen/party.cpp
+++ b/engines/xeen/party.cpp
@@ -1444,7 +1444,9 @@ bool Party::giveExt(int mode1, uint val1, int mode2, uint val2, int mode3, uint
 	Scripts &scripts = *g_vm->_scripts;
 	Sound &sound = *g_vm->_sound;
 
-	if (intf._objNumber != -1 && !scripts._animCounter) {
+	// WORKAROUND: Ali Baba's chest in Dark Side requires the character in the first slot to have Lockpicking.
+	// This is obviously a mistake, since the chest is meant to be opened via a password
+	if (intf._objNumber != -1 && !scripts._animCounter && !(files._ccNum && _mazeId == 63 && intf._objNumber == 15)) {
 		MazeObject &obj = map._mobData._objects[intf._objNumber];
 		switch (obj._spriteId) {
 		case 15:





More information about the Scummvm-git-logs mailing list