From 0782dec38999dbe574e1c090d26ceff0358bd7ae Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Sat, 2 Apr 2022 15:28:41 +0000 Subject: [PATCH] ESC: unready weapon for all selected mercs. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9357 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Turn Based Input.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index dbe11133..d76531bc 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -2215,6 +2215,18 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) { // ATE: OK, stop any mercs who are moving by selection method.... StopRubberBandedMercFromMoving(); + + // sevenfm: unready weapon for all selected + UINT8 cnt = gTacticalStatus.Team[gbPlayerNum].bFirstID; + for (SOLDIERTYPE *pSoldier = MercPtrs[cnt]; cnt <= gTacticalStatus.Team[gbPlayerNum].bLastID; cnt++, pSoldier++) + { + if (pSoldier->bActive && pSoldier->bInSector && pSoldier->flags.uiStatusFlags & SOLDIER_MULTI_SELECTED && WeaponReady(pSoldier)) + { + pSoldier->InternalSoldierReadyWeapon(pSoldier->ubDirection, TRUE, FALSE); + HandleSight(pSoldier, SIGHT_LOOK); + } + } + continue; } else if (gusSelectedSoldier != NOBODY &&