1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gear templates: An entry with '0' and a valid ammo item will try to fit that ammo to any gun used in the slot

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-08-12 12:45:33 +00:00
parent b64e0d0f91
commit 8e6cff9b5d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Items.cpp
+2 -1
View File
@@ -9667,7 +9667,8 @@ void ReadEquipmentTable( SOLDIERTYPE* pSoldier, std::string name )
ammoitem = (*pObj)[i]->data.gun.usGunAmmoItem;
for ( std::vector<GEAR_NODE>::iterator it = vec.begin( ); it != vec.end( ); ++it )
{
if ( (*it).slot == slot && (*it).item == pObj->usItem )
// use the ammotype of the node, provided it exists and fits the gun or a wildcard
if ( (*it).slot == slot && (*it).ammoitem != NOTHING && ( (*it).item == pObj->usItem || (*it).item == NOTHING ) )
{
ammoitem = (*it).ammoitem;
break;