Skip to content

Combine search loops into one #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Asdow merged 1 commit into from
Nov 19, 2025
Merged

Combine search loops into one #558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 8 additions & 40 deletions Tactical/Overhead.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4889,54 +4889,20 @@ SOLDIERTYPE *FindNextActiveSquad( SOLDIERTYPE *pSoldier )

SoldierID FindPrevActiveAndAliveMerc( SOLDIERTYPE *pSoldier, BOOLEAN fGoodForLessOKLife, BOOLEAN fOnlyRegularMercs )
{
SOLDIERTYPE *pTeamSoldier;


// loop back
SoldierID bLastTeamID = gTacticalStatus.Team[ pSoldier->bTeam ].bFirstID;
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 )
{
pTeamSoldier = cnt;
if ( fOnlyRegularMercs )
{
if ( AM_AN_EPC( pTeamSoldier ) || AM_A_ROBOT( pTeamSoldier ) )
{
continue;
}
}

if ( fGoodForLessOKLife )
{
// Check for bLife > 0
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
// Guard against ubID underflow. We'll start searching for previous merc from the lastID in that case
if ( cnt >= NOBODY )
{
if ( OK_CONTROLLABLE_MERC( pTeamSoldier ) && OK_INTERRUPT_MERC( pTeamSoldier ) && pSoldier->bAssignment == pTeamSoldier->bAssignment )
{
return( cnt );
}
cnt = gTacticalStatus.Team[pSoldier->bTeam].bLastID + 1;
continue;
}
}

bLastTeamID = pSoldier->ubID;
cnt = gTacticalStatus.Team[ pSoldier->bTeam ].bLastID;

// look for all mercs on the same team,
for ( ; cnt > bLastTeamID; --cnt )
{
pTeamSoldier = cnt;
SOLDIERTYPE* pTeamSoldier = cnt;
if ( fOnlyRegularMercs )
{
if ( AM_AN_EPC( pTeamSoldier ) || AM_A_ROBOT( pTeamSoldier ) )
Expand All @@ -4947,20 +4913,22 @@ SoldierID FindPrevActiveAndAliveMerc( SOLDIERTYPE *pSoldier, BOOLEAN fGoodForLes

if ( fGoodForLessOKLife )
{
// Check for bLife > 0
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 )
if ( OK_CONTROLLABLE_MERC( pTeamSoldier ) && OK_INTERRUPT_MERC( pTeamSoldier ) && pSoldier->bAssignment == pTeamSoldier->bAssignment )
{
return( cnt );
}
}
}


// none found,
// IF we are here, keep as we always were!
return( pSoldier->ubID );
Expand Down