From 874a006d069e2345ea7552299ad33b2822cc8c7f Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 15 Aug 2017 12:20:27 +0000 Subject: [PATCH] Gear templates: multiple ammo item choices are possible via wildcards, but if item is a match, use ammo specified there git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8449 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Handle Items.cpp | 4 +++- TileEngine/Explosion Control.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index 2526509f..6c240d0e 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -9671,7 +9671,9 @@ void ReadEquipmentTable( SOLDIERTYPE* pSoldier, std::string name ) if ( (*it).slot == slot && (*it).ammoitem != NOTHING && ( (*it).item == pObj->usItem || (*it).item == NOTHING ) ) { ammoitem = (*it).ammoitem; - break; + + if ( (*it).item == pObj->usItem ) + break; } } diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp index f5d65d37..0ac60f36 100644 --- a/TileEngine/Explosion Control.cpp +++ b/TileEngine/Explosion Control.cpp @@ -4334,7 +4334,7 @@ void HandleExplosionWarningAnimations( ) } else { - // if condition'S don't apply, deactivate skill. This will cause it to update to status changes very fast + // if conditions don't apply, deactivate skill. This will cause it to update to status changes very fast pSoldier->usSoldierFlagMask2 &= ~SOLDIER_TRAIT_FOCUS; pSoldier->sFocusGridNo = NOWHERE; } @@ -4342,10 +4342,10 @@ void HandleExplosionWarningAnimations( ) } // show riot shields - SOLDIERTYPE* pSoldier; - UINT16 cnt = gTacticalStatus.Team[0].bFirstID; - for ( pSoldier = MercPtrs[cnt]; cnt <= gTacticalStatus.Team[CIV_TEAM].bLastID; ++cnt, pSoldier++ ) + for ( UINT32 cnt = 0; cnt < TOTAL_SOLDIERS; ++cnt ) { + SOLDIERTYPE* pSoldier = MercPtrs[cnt]; + if ( pSoldier && pSoldier->bActive && pSoldier->bInSector ) { if ( (pSoldier->ubDirection == EAST ||