1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gear templates: multiple ammo item choices are possible via wildcards, but if item is a match, use ammo specified there

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8449 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-08-15 12:20:27 +00:00
parent 561f6387cd
commit 874a006d06
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Items.cpp
+3 -1
View File
@@ -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;
}
}
TileEngine/Explosion Control.cpp
+4 -4
View File
@@ -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 ||