From 49bcd5a4ad17f359b2b1362d22ed343cdbae912f Mon Sep 17 00:00:00 2001 From: sanctum32 Date: Fri, 11 Oct 2013 19:55:04 +0300 Subject: [PATCH] [12685] Add some safety to rare case of target-selection for unreachable target Thanks to Atari for reporting and researching this problem --- src/game/Unit.cpp | 3 ++- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index afb40742b..51d44fdee 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9389,7 +9389,8 @@ bool Unit::SelectHostileTarget() m_HostileRefManager.deleteReference(target); m_ThreatManager.modifyThreatPercent(target, -101); - _removeAttacker(target); + // remove target from current attacker, do not exit combat settings + AttackStop(true); } return false; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 308786fe0..020a2e12c 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12684" + #define REVISION_NR "12685" #endif // __REVISION_NR_H__