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

Merge branch 'master' into ExtraMercs

Browse Source
This commit is contained in:
Asdow
2024-11-09 13:44:53 +02:00
parent 06918d7585 6497a35af9
commit 10250dc035
371 changed files with 6539 additions and 13390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Merc Contract.cpp
+2 -2
View File
@@ -995,13 +995,13 @@ BOOLEAN StrategicRemoveMerc( SOLDIERTYPE *pSoldier )
if( ( pSoldier->bAssignment != VEHICLE ) && !( pSoldier->flags.uiStatusFlags & ( SOLDIER_DRIVER | SOLDIER_PASSENGER ) ) )
//if ( pSoldier->bAssignment != VEHICLE )
{ //Can only remove groups if they aren't persistant (not in a squad or vehicle)
RemoveGroup( pSoldier->ubGroupID );
RemovePlayerFromGroup(pSoldier->ubGroupID, pSoldier);
}
else
{
// remove him from any existing merc slot he could be in
RemoveMercSlot( pSoldier );
TakeSoldierOutOfVehicle( pSoldier );
TakeSoldierOutOfVehicle( pSoldier );
}
}