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

minor code cleanup

Browse Source 
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:
Flugente
2017-03-11 13:19:20 +00:00
parent dc5db5c06a
commit 125fda3905
5 changed files with 54 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Quests.cpp
+10 -11
View File
@@ -270,30 +270,29 @@ BOOLEAN CheckIfMercIsNearNPC( SOLDIERTYPE *pMerc, UINT8 ubProfileId )
}
INT8 NumWoundedMercsNearby( UINT8 ubProfileID )
UINT32 NumWoundedMercsNearby( UINT8 ubProfileID )
{
INT8 bNumber = 0;
UINT32 uiLoop;
SOLDIERTYPE * pNPC;
SOLDIERTYPE * pSoldier;
INT32 sGridNo;
UINT32 bNumber = 0;
SOLDIERTYPE* pSoldier;
pNPC = FindSoldierByProfileID( ubProfileID, FALSE );
SOLDIERTYPE* pNPC = FindSoldierByProfileID( ubProfileID, FALSE );
if (!pNPC)
{
return( FALSE );
}
sGridNo = pNPC->sGridNo;
for ( uiLoop = 0; uiLoop < guiNumMercSlots; uiLoop++)
INT32 sGridNo = pNPC->sGridNo;
for ( UINT32 uiLoop = 0; uiLoop < guiNumMercSlots; ++uiLoop )
{
pSoldier = MercSlots[ uiLoop ];
if ( pSoldier && pSoldier->bTeam == gbPlayerNum && pSoldier->stats.bLife > 0 && pSoldier->stats.bLife < pSoldier->stats.bLifeMax && pSoldier->bAssignment != ASSIGNMENT_HOSPITAL )
if ( pSoldier && pSoldier->bTeam == gbPlayerNum && pSoldier->stats.bLife > 0 && pSoldier->stats.bLife < pSoldier->stats.bLifeMax && pSoldier->bAssignment != ASSIGNMENT_HOSPITAL
&& pSoldier->sSectorX == pNPC->sSectorX && pSoldier->sSectorY == pNPC->sSectorY && pSoldier->bSectorZ == pNPC->bSectorZ )
{
if (PythSpacesAway( sGridNo, pSoldier->sGridNo ) <= HOSPITAL_PATIENT_DISTANCE)
{
bNumber++;
++bNumber;
}
}
}