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 GetSoldierIDFromMercID() to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-18 18:50:20 +02:00
parent c75f57785e
commit e62684f0e1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Add.cpp
+2 -2
View File
@@ -1788,7 +1788,7 @@ BOOLEAN IsMercOnTeam(UINT8 ubMercID, BOOLEAN aAlreadyInCountry, BOOLEAN aAlive)
// GetSoldierIDFromMercID() Gets the Soldier ID from the Merc Profile ID, else returns -1
INT16 GetSoldierIDFromMercID(UINT8 ubMercID)
SoldierID GetSoldierIDFromMercID(UINT8 ubMercID)
{
SOLDIERTYPE *pTeamSoldier = NULL;
@@ -1804,7 +1804,7 @@ INT16 GetSoldierIDFromMercID(UINT8 ubMercID)
}
}
return -1 ;
return NOBODY;
}
Tactical/Soldier Add.h
+2 -2
View File
@@ -41,8 +41,8 @@ BOOLEAN IsMercOnTeam( UINT8 ubMercID, BOOLEAN aAlreadyInCountry, BOOLEAN aAlive
// GetSoldierIDFromMercID() Gets the Soldier ID from the Merc Profile ID, else returns -1
INT16 GetSoldierIDFromMercID(UINT8 ubMercID);
// GetSoldierIDFromMercID() Gets the Soldier ID from the Merc Profile ID, else returns NOBODY
SoldierID GetSoldierIDFromMercID(UINT8 ubMercID);
INT32 FindGridNoFromSweetSpotWithStructData( SOLDIERTYPE *pSoldier, UINT16 usAnimState, INT32 sSweetGridNo, INT8 ubRadius, UINT8 *pubDirection, BOOLEAN fClosestToMerc );