[Scummvm-git-logs] scummvm master -> 8a42959eed458e3ffa913b8e2cce463857cd9dc1

dreammaster dreammaster at scummvm.org
Wed Nov 8 02:04:08 CET 2017


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:
8a42959eed XEEN: Fix FX calls in multiAttack


Commit: 8a42959eed458e3ffa913b8e2cce463857cd9dc1
    https://github.com/scummvm/scummvm/commit/8a42959eed458e3ffa913b8e2cce463857cd9dc1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-07T20:04:00-05:00

Commit Message:
XEEN: Fix FX calls in multiAttack

Changed paths:
    engines/xeen/combat.cpp


diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index 784dd18..f60ed38 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1830,6 +1830,8 @@ void Combat::multiAttack(int powNum) {
 			sound.playFX(21);
 			return;
 		}
+
+		sound.playFX(49);
 	} else {
 		_shooting[0] = 1;
 		_shootType = ST_0;
@@ -1914,7 +1916,7 @@ void Combat::multiAttack(int powNum) {
 		}
 	} else {
 		int cell = map.getCell(2);
-		if (cell < map.mazeData()._difficulties._wallNoPass) {
+		if (cell >= map.mazeData()._difficulties._wallNoPass) {
 			sound.playFX(46);
 			goto finished;
 		}
@@ -1964,7 +1966,7 @@ void Combat::multiAttack(int powNum) {
 		}
 	} else {
 		int cell = map.getCell(7);
-		if (cell < map.mazeData()._difficulties._wallNoPass) {
+		if (cell >= map.mazeData()._difficulties._wallNoPass) {
 			sound.playFX(46);
 			goto finished;
 		}
@@ -2014,7 +2016,7 @@ void Combat::multiAttack(int powNum) {
 		}
 	} else {
 		int cell = map.getCell(14);
-		if (cell < map.mazeData()._difficulties._wallNoPass) {
+		if (cell >= map.mazeData()._difficulties._wallNoPass) {
 			sound.playFX(46);
 			goto finished;
 		}





More information about the Scummvm-git-logs mailing list