[Scummvm-git-logs] scummvm master -> 92cfff522f8a5dddefa75b2d5d85b89fff6b74e0

[dreammaster]

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:
92cfff522f XEEN: Fix using 1,2,3 in combat to target specific creatures


Commit: 92cfff522f8a5dddefa75b2d5d85b89fff6b74e0
    https://github.com/scummvm/scummvm/commit/92cfff522f8a5dddefa75b2d5d85b89fff6b74e0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-08-09T11:51:55-07:00

Commit Message:
XEEN: Fix using 1,2,3 in combat to target specific creatures

Changed paths:
    engines/xeen/combat.cpp


diff --git a/engines/xeen/combat.cpp b/engines/xeen/combat.cpp
index f6d16ae..00e89d6 100644
--- a/engines/xeen/combat.cpp
+++ b/engines/xeen/combat.cpp
@@ -1156,7 +1156,7 @@ Common::String Combat::getMonsterDescriptions() {
 
 	if (_attackDurationCtr == 2 && _attackMonsters[2] != -1) {
 		_monster2Attack = _attackMonsters[2];
-	} if (_attackDurationCtr == 1 && _attackMonsters[1] != -1) {
+	} else if (_attackDurationCtr == 1 && _attackMonsters[1] != -1) {
 		_monster2Attack = _attackMonsters[1];
 	} else {
 		_monster2Attack = _attackMonsters[0];