mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
minor code cleanup
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8393 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -15358,14 +15358,14 @@ void SetSoldierAssignment( SOLDIERTYPE *pSoldier, INT8 bAssignment, INT32 iParam
|
||||
TakeSoldierOutOfVehicle( pSoldier );
|
||||
}
|
||||
|
||||
if( ( pSoldier->bAssignment != ASSIGNMENT_HOSPITAL ) )
|
||||
if ( (pSoldier->bAssignment != bAssignment) )
|
||||
{
|
||||
SetTimeOfAssignmentChangeForMerc( pSoldier );
|
||||
}
|
||||
|
||||
RebuildCurrentSquad( );
|
||||
|
||||
ChangeSoldiersAssignment( pSoldier, ASSIGNMENT_HOSPITAL );
|
||||
ChangeSoldiersAssignment( pSoldier, bAssignment );
|
||||
|
||||
AssignMercToAMovementGroup( pSoldier );
|
||||
}
|
||||
@@ -16029,15 +16029,7 @@ BOOLEAN IsTheSAMSiteInSectorRepairable( INT16 sSectorX, INT16 sSectorY, INT16 sS
|
||||
{
|
||||
INT8 bSAMCondition = StrategicMap[CALCULATE_STRATEGIC_INDEX( sSectorX, sSectorY )].bSAMCondition;
|
||||
|
||||
if ( bSAMCondition < 100 )
|
||||
{
|
||||
return( TRUE );
|
||||
}
|
||||
else
|
||||
{
|
||||
// it's not broken at all, or it's beyond repair
|
||||
return( FALSE );
|
||||
}
|
||||
return (bSAMCondition < 100);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user