1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

prefer happy path to recursion with double execution

Browse Source 
there's no return after recursion, so the tail of the function runs
twice
This commit is contained in:
Marco Antonio J. Costa
2026-08-09 12:23:01 -03:00
committed by majcosta
parent 380fedca10
commit 9a19e21cd5
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Strategic Movement.cpp
+23 -25
View File
@@ -4628,33 +4628,31 @@ void RetreatGroupToPreviousSector( GROUP *pGroup )
Assert( pGroup );
AssertMsg( !pGroup->fBetweenSectors, "Can't retreat a group when between sectors!" );
if( pGroup->ubPrevX != 16 || pGroup->ubPrevY != 16 )
{ //Group has a previous sector
pGroup->ubNextX = pGroup->ubPrevX;
pGroup->ubNextY = pGroup->ubPrevY;
//Determine the correct direction.
dx = pGroup->ubNextX - pGroup->ubSectorX;
dy = pGroup->ubNextY - pGroup->ubSectorY;
if( dy == -1 && !dx )
ubDirection = NORTH_STRATEGIC_MOVE;
else if( dx == 1 && !dy )
ubDirection = EAST_STRATEGIC_MOVE;
else if( dy == 1 && !dx )
ubDirection = SOUTH_STRATEGIC_MOVE;
else if( dx == -1 && !dy )
ubDirection = WEST_STRATEGIC_MOVE;
else
{
AssertMsg( 0, String("Player group attempting illegal retreat from %c%d to %c%d.",
pGroup->ubSectorY+'A'-1, pGroup->ubSectorX, pGroup->ubNextY+'A'-1, pGroup->ubNextX ) );
}
if (pGroup->ubPrevX == 16 && pGroup->ubPrevY == 16)
{
//Group doesn't have a previous sector. Create one.
CalculateGroupRetreatSector(pGroup);
}
pGroup->ubNextX = pGroup->ubPrevX;
pGroup->ubNextY = pGroup->ubPrevY;
//Determine the correct direction.
dx = pGroup->ubNextX - pGroup->ubSectorX;
dy = pGroup->ubNextY - pGroup->ubSectorY;
if( dy == -1 && !dx )
ubDirection = NORTH_STRATEGIC_MOVE;
else if( dx == 1 && !dy )
ubDirection = EAST_STRATEGIC_MOVE;
else if( dy == 1 && !dx )
ubDirection = SOUTH_STRATEGIC_MOVE;
else if( dx == -1 && !dy )
ubDirection = WEST_STRATEGIC_MOVE;
else
{ //Group doesn't have a previous sector. Create one, then recurse
CalculateGroupRetreatSector( pGroup );
RetreatGroupToPreviousSector( pGroup );
{
AssertMsg( 0, String("Player group attempting illegal retreat from %c%d to %c%d.",
pGroup->ubSectorY+'A'-1, pGroup->ubSectorX, pGroup->ubNextY+'A'-1, pGroup->ubNextX ) );
}
//Calc time to get to next waypoint...