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

Convert to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-17 20:41:09 +02:00
parent 9532fbfe2c
commit f50bdf99cc
22 changed files with 188 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+4 -4
View File
@@ -15287,10 +15287,10 @@ BOOLEAN ObjectIsExternalFeeder(SOLDIERTYPE* pSoldier, OBJECTTYPE * pObject)
if ( !pSoldier || !pObject)
return( FALSE );
UINT16 usSoldierFeedingTarget1 = 0;
SoldierID usSoldierFeedingTarget1 = NOBODY;
UINT16 usGunSlot1 = 0;
UINT16 usAmmoSlot1 = 0;
UINT16 usSoldierFeedingTarget2 = 0;
SoldierID usSoldierFeedingTarget2 = NOBODY;
UINT16 usGunSlot2 = 0;
UINT16 usAmmoSlot2 = 0;
if ( pSoldier->IsFeedingExternal(&usSoldierFeedingTarget1, &usGunSlot1, &usAmmoSlot1, &usSoldierFeedingTarget2, &usGunSlot2, &usAmmoSlot2) )
@@ -15345,10 +15345,10 @@ OBJECTTYPE* GetExternalFeedingObject(SOLDIERTYPE* pSoldier, OBJECTTYPE * pObject
continue;
// we check if that guy is feeding someone, and that someone is really us
UINT16 usTeamSoldierFeedingTarget1 = 0;
SoldierID usTeamSoldierFeedingTarget1 = NOBODY;
UINT16 usGunSlot1 = 0;
UINT16 usAmmoSlot1 = 0;
UINT16 usTeamSoldierFeedingTarget2 = 0;
SoldierID usTeamSoldierFeedingTarget2 = NOBODY;
UINT16 usGunSlot2 = 0;
UINT16 usAmmoSlot2 = 0;
if ( pTeamSoldier->IsFeedingExternal(&usTeamSoldierFeedingTarget1, &usGunSlot1, &usAmmoSlot1, &usTeamSoldierFeedingTarget2, &usGunSlot2, &usAmmoSlot2) )