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

GetSoldier() to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-17 10:33:29 +02:00
parent 3e1c87f53c
commit 3fe6e4f3d8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle UI Plan.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ BOOLEAN AddUIPlan( INT32 sGridNo, UINT8 ubPlanID )
if ( TacticalCreateSoldier( &MercCreateStruct, &ubNewIndex ) ) if ( TacticalCreateSoldier( &MercCreateStruct, &ubNewIndex ) )
{ {
// Get pointer to soldier // Get pointer to soldier
GetSoldier( &pPlanSoldier, (UINT16)ubNewIndex ); GetSoldier( &pPlanSoldier, ubNewIndex );
pPlanSoldier->sPlannedTargetX = -1; pPlanSoldier->sPlannedTargetX = -1;
pPlanSoldier->sPlannedTargetY = -1; pPlanSoldier->sPlannedTargetY = -1;
Tactical/Overhead.cpp
+4 -4
View File
@@ -832,21 +832,21 @@ BOOLEAN ShutdownOverhead( )
return( TRUE ); return( TRUE );
} }
BOOLEAN GetSoldier( SOLDIERTYPE **ppSoldier, UINT16 usSoldierIndex ) BOOLEAN GetSoldier( SOLDIERTYPE **ppSoldier, SoldierID usSoldierIndex )
{ {
// Check range of index given // Check range of index given
*ppSoldier = NULL; *ppSoldier = NULL;
if ( usSoldierIndex < 0 || usSoldierIndex > TOTAL_SOLDIERS-1 ) if ( usSoldierIndex >= NOBODY )
{ {
// Set debug message // Set debug message
return( FALSE ); return( FALSE );
} }
// Check if a guy exists here // Check if a guy exists here
// Does another soldier exist here? // Does another soldier exist here?
if ( MercPtrs[ usSoldierIndex ]->bActive ) if ( usSoldierIndex->bActive )
{ {
// Set Existing guy // Set Existing guy
*ppSoldier = MercPtrs[ usSoldierIndex ]; *ppSoldier = usSoldierIndex;
return( TRUE); return( TRUE);
} }
else else
Tactical/Overhead.h
+1 -1
View File
@@ -203,7 +203,7 @@ void ShutdownTacticalEngine( );
BOOLEAN InitOverhead( ); BOOLEAN InitOverhead( );
BOOLEAN ShutdownOverhead( ); BOOLEAN ShutdownOverhead( );
BOOLEAN GetSoldier( SOLDIERTYPE **ppSoldier, UINT16 usSoldierIndex ); BOOLEAN GetSoldier( SOLDIERTYPE **ppSoldier, SoldierID usSoldierIndex );
UINT32 CountNonVehiclesOnPlayerTeam( ); UINT32 CountNonVehiclesOnPlayerTeam( );