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

Combine search loops into one

Browse Source 
Reduces code duplication and fixes an illegal memory access that was still present.
This commit is contained in:
Asdow
2025-11-19 13:57:18 +02:00
parent f902b01497
commit 58c134bd8e
1 changed files with 8 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+8 -40
View File
@@ -4889,22 +4889,20 @@ SOLDIERTYPE *FindNextActiveSquad( SOLDIERTYPE *pSoldier )
SoldierID FindPrevActiveAndAliveMerc( SOLDIERTYPE *pSoldier, BOOLEAN fGoodForLessOKLife, BOOLEAN fOnlyRegularMercs ) SoldierID FindPrevActiveAndAliveMerc( SOLDIERTYPE *pSoldier, BOOLEAN fGoodForLessOKLife, BOOLEAN fOnlyRegularMercs )
{ {
SOLDIERTYPE *pTeamSoldier;
// loop back
SoldierID bLastTeamID = gTacticalStatus.Team[ pSoldier->bTeam ].bFirstID; SoldierID bLastTeamID = gTacticalStatus.Team[ pSoldier->bTeam ].bFirstID;
SoldierID cnt = pSoldier->ubID - 1; SoldierID cnt = pSoldier->ubID - 1;
// Guard against ubID underflow. We'll start searching for previous merc from the lastID in that case
if ( cnt >= NOBODY )
{
cnt = gTacticalStatus.Team[pSoldier->bTeam].bLastID;
}
for ( ; cnt >= bLastTeamID; --cnt ) for ( ; cnt >= bLastTeamID; --cnt )
{ {
pTeamSoldier = cnt; // Guard against ubID underflow. We'll start searching for previous merc from the lastID in that case
if ( cnt >= NOBODY )
{
cnt = gTacticalStatus.Team[pSoldier->bTeam].bLastID + 1;
continue;
}
SOLDIERTYPE* pTeamSoldier = cnt;
if ( fOnlyRegularMercs ) if ( fOnlyRegularMercs )
{ {
if ( AM_AN_EPC( pTeamSoldier ) || AM_A_ROBOT( pTeamSoldier ) ) if ( AM_AN_EPC( pTeamSoldier ) || AM_A_ROBOT( pTeamSoldier ) )
@@ -4930,36 +4928,6 @@ SoldierID FindPrevActiveAndAliveMerc( SOLDIERTYPE *pSoldier, BOOLEAN fGoodForLes
} }
} }
bLastTeamID = pSoldier->ubID;
cnt = gTacticalStatus.Team[ pSoldier->bTeam ].bLastID;
// look for all mercs on the same team,
for ( ; cnt > bLastTeamID; --cnt )
{
pTeamSoldier = cnt;
if ( fOnlyRegularMercs )
{
if ( AM_AN_EPC( pTeamSoldier ) || AM_A_ROBOT( pTeamSoldier ) )
{
continue;
}
}
if ( fGoodForLessOKLife )
{
if ( pTeamSoldier->stats.bLife > 0 && pTeamSoldier->bActive && pTeamSoldier->bInSector && pTeamSoldier->bTeam == gbPlayerNum && ( pTeamSoldier->bAssignment < ON_DUTY || pTeamSoldier->bAssignment == VEHICLE ) && OK_INTERRUPT_MERC( pTeamSoldier ) && pSoldier->bAssignment == pTeamSoldier->bAssignment )
{
return( cnt );
}
}
else
{
if ( OK_CONTROLLABLE_MERC( pTeamSoldier) && OK_INTERRUPT_MERC( pTeamSoldier ) && pSoldier->bAssignment == pTeamSoldier->bAssignment )
{
return( cnt );
}
}
}
// none found, // none found,
// IF we are here, keep as we always were! // IF we are here, keep as we always were!