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

Convert functions and globals to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-17 14:53:52 +02:00
parent f58cf588a6
commit 34f0b40f93
23 changed files with 240 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Squads.cpp
+1 -3
View File
@@ -1327,8 +1327,6 @@ void RebuildSquad( INT8 bSquadValue )
void UpdateCurrentlySelectedMerc( SOLDIERTYPE *pSoldier, INT8 bSquadValue )
{
UINT16 ubID;
// if this squad is the current one and and the psoldier is the currently selected soldier, get rid of 'em
if( bSquadValue != iCurrentTacticalSquad )
{
@@ -1338,7 +1336,7 @@ void UpdateCurrentlySelectedMerc( SOLDIERTYPE *pSoldier, INT8 bSquadValue )
// Are we the selected guy?
if( gusSelectedSoldier == pSoldier->ubID )
{
ubID = FindNextActiveAndAliveMerc( pSoldier, FALSE, FALSE );
SoldierID ubID = FindNextActiveAndAliveMerc( pSoldier, FALSE, FALSE );
if ( ubID != NOBODY && ubID != gusSelectedSoldier )
{