mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
Import changes from the local SVN working copy
This commit is contained in:
+20
-19
@@ -44,9 +44,9 @@ BOOLEAN FindAutobandageClimbPoint( INT32 sDesiredGridNo, BOOLEAN fClimbUp )
|
||||
{
|
||||
// checks for existance of location to climb up to building, not occupied by a medic
|
||||
BUILDING * pBuilding;
|
||||
UINT8 ubNumClimbSpots;
|
||||
UINT8 ubNumClimbSpots;
|
||||
UINT8 ubLoop;
|
||||
UINT8 ubWhoIsThere;
|
||||
UINT16 ubWhoIsThere;
|
||||
|
||||
pBuilding = FindBuilding( sDesiredGridNo );
|
||||
if (!pBuilding)
|
||||
@@ -76,8 +76,8 @@ BOOLEAN FindAutobandageClimbPoint( INT32 sDesiredGridNo, BOOLEAN fClimbUp )
|
||||
|
||||
BOOLEAN FullPatientCheck( SOLDIERTYPE * pPatient )
|
||||
{
|
||||
UINT8 cnt;
|
||||
SOLDIERTYPE * pSoldier;
|
||||
UINT16 cnt;
|
||||
SOLDIERTYPE * pSoldier;
|
||||
|
||||
if ( CanCharacterAutoBandageTeammate( pPatient ) )
|
||||
{
|
||||
@@ -123,10 +123,10 @@ BOOLEAN FullPatientCheck( SOLDIERTYPE * pPatient )
|
||||
BOOLEAN CanAutoBandage( BOOLEAN fDoFullCheck )
|
||||
{
|
||||
// returns false if we should stop being in auto-bandage mode
|
||||
UINT8 cnt;
|
||||
UINT8 ubMedics = 0, ubPatients = 0;
|
||||
UINT16 cnt;
|
||||
UINT16 ubMedics = 0, ubPatients = 0;
|
||||
SOLDIERTYPE * pSoldier;
|
||||
static UINT8 ubIDForFullCheck = NOBODY;
|
||||
static UINT16 ubIDForFullCheck = NOBODY;
|
||||
|
||||
// run though the list of chars on team
|
||||
cnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
|
||||
@@ -231,18 +231,19 @@ BOOLEAN CanCharacterBeAutoBandagedByTeammate( SOLDIERTYPE *pSoldier )
|
||||
|
||||
INT8 FindBestPatient( SOLDIERTYPE * pSoldier, BOOLEAN * pfDoClimb )
|
||||
{
|
||||
UINT8 cnt, cnt2;
|
||||
INT32 bBestPriority = 0, sBestAdjGridNo = NOWHERE;
|
||||
INT32 sPatientGridNo = NOWHERE, sBestPatientGridNo = NOWHERE;
|
||||
INT16 sShortestPath = 1000, sPathCost, sOtherMedicPathCost;
|
||||
SOLDIERTYPE * pPatient;
|
||||
SOLDIERTYPE * pBestPatient = NULL;
|
||||
SOLDIERTYPE * pOtherMedic;
|
||||
INT8 bPatientPriority;
|
||||
UINT8 ubDirection;
|
||||
UINT16 cnt;
|
||||
UINT8 cnt2;
|
||||
INT32 bBestPriority = 0, sBestAdjGridNo = NOWHERE;
|
||||
INT32 sPatientGridNo = NOWHERE, sBestPatientGridNo = NOWHERE;
|
||||
INT16 sShortestPath = 1000, sPathCost, sOtherMedicPathCost;
|
||||
SOLDIERTYPE * pPatient;
|
||||
SOLDIERTYPE * pBestPatient = NULL;
|
||||
SOLDIERTYPE * pOtherMedic;
|
||||
INT8 bPatientPriority;
|
||||
UINT8 ubDirection;
|
||||
INT32 sAdjustedGridNo, sAdjacentGridNo, sOtherAdjacentGridNo;
|
||||
INT32 sClimbGridNo, sBestClimbGridNo = NOWHERE, sShortestClimbPath = 1000;
|
||||
BOOLEAN fClimbingNecessary;
|
||||
INT32 sClimbGridNo, sBestClimbGridNo = NOWHERE, sShortestClimbPath = 1000;
|
||||
BOOLEAN fClimbingNecessary;
|
||||
|
||||
gubGlobalPathFlags = PATH_THROUGH_PEOPLE;
|
||||
|
||||
@@ -478,7 +479,7 @@ INT8 DecideAutoBandage( SOLDIERTYPE * pSoldier )
|
||||
BOOLEAN DoctorIsPresent( SOLDIERTYPE * pPatient, BOOLEAN fOnDoctorAssignmentCheck )
|
||||
{
|
||||
SOLDIERTYPE * pMedic = NULL;
|
||||
UINT8 cnt;
|
||||
UINT16 cnt;
|
||||
INT8 bSlot;
|
||||
BOOLEAN fDoctorHasBeenFound = FALSE;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user