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

Use SoldierID

Browse Source
This commit is contained in:
Asdow
2024-12-01 18:23:52 +02:00
parent e59d915e58
commit bfb724eab9
36 changed files with 1165 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Add.cpp
+7 -9
View File
@@ -1761,16 +1761,14 @@ void AddSoldierToSectorGridNo( SOLDIERTYPE *pSoldier, INT32 sGridNo, UINT8 ubDir
// IsMercOnTeam() checks to see if the passed in Merc Profile ID is currently on the player's team
BOOLEAN IsMercOnTeam(UINT8 ubMercID, BOOLEAN aAlreadyInCountry, BOOLEAN aAlive)
{
UINT16 cnt;
UINT16 ubLastTeamID;
SOLDIERTYPE *pTeamSoldier;
cnt = gTacticalStatus.Team[ OUR_TEAM ].bFirstID;
ubLastTeamID = gTacticalStatus.Team[ OUR_TEAM ].bLastID;
SoldierID cnt = gTacticalStatus.Team[ OUR_TEAM ].bFirstID;
SoldierID ubLastTeamID = gTacticalStatus.Team[ OUR_TEAM ].bLastID;
// look for all mercs on the same team,
for ( pTeamSoldier = MercPtrs[ cnt ]; cnt <= ubLastTeamID; ++cnt, pTeamSoldier++)
for ( ; cnt <= ubLastTeamID; ++cnt )
{
pTeamSoldier = cnt;
if ( pTeamSoldier->ubProfile == ubMercID && pTeamSoldier->bActive )
{
if ( aAlreadyInCountry && pTeamSoldier->bAssignment == IN_TRANSIT )
@@ -1791,12 +1789,12 @@ BOOLEAN IsMercOnTeam(UINT8 ubMercID, BOOLEAN aAlreadyInCountry, BOOLEAN aAlive)
SoldierID GetSoldierIDFromMercID(UINT8 ubMercID)
{
SOLDIERTYPE *pTeamSoldier = NULL;
UINT16 cnt = gTacticalStatus.Team[OUR_TEAM].bFirstID;
SoldierID cnt = gTacticalStatus.Team[OUR_TEAM].bFirstID;
// look for all mercs on the same team,
for ( pTeamSoldier = MercPtrs[cnt]; cnt <= gTacticalStatus.Team[OUR_TEAM].bLastID; ++cnt, ++pTeamSoldier )
for ( ; cnt <= gTacticalStatus.Team[OUR_TEAM].bLastID; ++cnt )
{
pTeamSoldier = cnt;
if ( pTeamSoldier->ubProfile == ubMercID )
{
if( pTeamSoldier->bActive )