From 9d716dcaae8dcf2bcf60d57198f0d3d45b12fc09 Mon Sep 17 00:00:00 2001 From: bugmonster Date: Wed, 14 Nov 2007 16:55:07 +0000 Subject: [PATCH] - fixed bug when merc cannot automaticly leave the ring after boxing. This happens when SOLDIER_ENGAGEDINACTION flag is set. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1615 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Boxing.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Tactical/Boxing.cpp b/Tactical/Boxing.cpp index 336fcfca..fae6f58e 100644 --- a/Tactical/Boxing.cpp +++ b/Tactical/Boxing.cpp @@ -66,6 +66,8 @@ void ExitBoxing( void ) } // put guy under AI control temporarily pSoldier->uiStatusFlags |= SOLDIER_PCUNDERAICONTROL; + //SB: this flag don't allow merc leave the ring + pSoldier->uiStatusFlags &= ~SOLDIER_ENGAGEDINACTION; } else {