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

dreammaster dreammaster at scummvm.org
Sun Apr 8 17:23:25 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:
d9fd699050 XEEN: Fix using Lloyd's Beacon across the sides
ae6c2612a2 XEEN: Fix checking if a specific monster is dead


Commit: d9fd6990504f9c26631677bea07334ae2755bd46
    https://github.com/scummvm/scummvm/commit/d9fd6990504f9c26631677bea07334ae2755bd46
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-08T11:17:31-04:00

Commit Message:
XEEN: Fix using Lloyd's Beacon across the sides

Changed paths:
    engines/xeen/dialogs/dialogs_spells.cpp


diff --git a/engines/xeen/dialogs/dialogs_spells.cpp b/engines/xeen/dialogs/dialogs_spells.cpp
index bce34cb..0b6312c 100644
--- a/engines/xeen/dialogs/dialogs_spells.cpp
+++ b/engines/xeen/dialogs/dialogs_spells.cpp
@@ -770,8 +770,8 @@ bool LloydsBeacon::execute() {
 				result = false;
 			} else {
 				sound.playFX(51);
-				map._loadCcNum = ccNum;
 				if (c._lloydMap != party._mazeId || c._lloydSide != ccNum) {
+					map._loadCcNum = c._lloydSide;
 					map.load(c._lloydMap);
 				}
 


Commit: ae6c2612a26c495eea25ce1c16dfe6f6813c0ca6
    https://github.com/scummvm/scummvm/commit/ae6c2612a26c495eea25ce1c16dfe6f6813c0ca6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-04-08T11:23:18-04:00

Commit Message:
XEEN: Fix checking if a specific monster is dead

Changed paths:
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 47cea99..499dabc 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1226,7 +1226,7 @@ bool Scripts::cmdIfMapFlag(ParamsIterator &params) {
 	} else {
 		MazeMonster &monster = map._mobData._monsters[monsterNum];
 
-		if ((uint)monster._position.x < 32 && (uint)monster._position.y > 32)
+		if ((uint)monster._position.x < 32 && (uint)monster._position.y < 32)
 			return true;
 	}
 





More information about the Scummvm-git-logs mailing list