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

use SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-30 18:29:17 +02:00
parent 2eb16c583c
commit c2b1ac0109
3 changed files with 92 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/AI Viewer.cpp
+3 -4
View File
@@ -649,7 +649,7 @@ void RenderInfoInSector()
{ {
UINT8 ubSectorX, ubSectorY; UINT8 ubSectorX, ubSectorY;
UINT16 ubMercs=0, ubActive=0, ubUnconcious=0, ubCollapsed=0; UINT16 ubMercs=0, ubActive=0, ubUnconcious=0, ubCollapsed=0;
INT32 i, xp, yp; INT32 xp, yp;
if( gfViewEnemies && !gbViewLevel ) if( gfViewEnemies && !gbViewLevel )
{ {
@@ -694,11 +694,10 @@ void RenderInfoInSector()
//Count the number of mercs and their states (even for underground sectors) //Count the number of mercs and their states (even for underground sectors)
for( i = gTacticalStatus.Team[ OUR_TEAM ].bFirstID; i <= gTacticalStatus.Team[ OUR_TEAM ].bLastID; i++ ) for( SoldierID id = gTacticalStatus.Team[ OUR_TEAM ].bFirstID; id <= gTacticalStatus.Team[ OUR_TEAM ].bLastID; ++id )
{ {
SOLDIERTYPE *pSoldier; SOLDIERTYPE *pSoldier = id;
pSoldier = MercPtrs[ i ];
if( pSoldier->bActive && pSoldier->sSectorX == ubSectorX && pSoldier->sSectorY == ubSectorY && pSoldier->bSectorZ == gbViewLevel ) if( pSoldier->bActive && pSoldier->sSectorX == ubSectorX && pSoldier->sSectorY == ubSectorY && pSoldier->bSectorZ == gbViewLevel )
{ {
if( pSoldier->stats.bLife ) if( pSoldier->stats.bLife )
Strategic/Assignments.cpp
+84 -98
View File
@@ -1223,16 +1223,16 @@ BOOLEAN IsAnythingAroundForSoldierToClean( SOLDIERTYPE * pSoldier )
} }
// now the other merc's stuff // now the other merc's stuff
for(UINT16 teamIndex = gTacticalStatus.Team[gbPlayerNum].bFirstID; teamIndex <= gTacticalStatus.Team[gbPlayerNum].bLastID; ++teamIndex) for(SoldierID teamMember = gTacticalStatus.Team[gbPlayerNum].bFirstID; teamMember <= gTacticalStatus.Team[gbPlayerNum].bLastID; ++teamMember)
{ {
// Ignore self, mercs in other sectors, etc. // Ignore self, mercs in other sectors, etc.
if (CanCharacterRepairAnotherSoldiersStuff(pSoldier, MercPtrs[teamIndex])) if (CanCharacterRepairAnotherSoldiersStuff(pSoldier, teamMember))
{ {
// Iterate over all pocket slots and add items in need of repair // Iterate over all pocket slots and add items in need of repair
for (UINT8 pocketIndex = HANDPOS; pocketIndex < NUM_INV_SLOTS; ++pocketIndex) for (UINT8 pocketIndex = HANDPOS; pocketIndex < NUM_INV_SLOTS; ++pocketIndex)
{ {
const OBJECTTYPE* pObj = &(const_cast<SOLDIERTYPE *>(MercPtrs[teamIndex])->inv[pocketIndex]); const OBJECTTYPE* pObj = &(const_cast<SOLDIERTYPE *>(MercPtrs[teamMember])->inv[pocketIndex]);
if(pObj == NULL || pObj->ubNumberOfObjects == NOTHING || pObj->usItem == NOTHING) if(pObj == NULL || pObj->ubNumberOfObjects == NOTHING || pObj->usItem == NOTHING)
continue; continue;
@@ -1337,18 +1337,16 @@ BOOLEAN DoesCharacterHaveAnyItemsToRepair( SOLDIERTYPE *pSoldier, INT8 bHighestP
if ( bHighestPass != - 1 ) if ( bHighestPass != - 1 )
{ {
// now look for items to repair on other mercs // now look for items to repair on other mercs
for( UINT16 bLoop = gTacticalStatus.Team[ gbPlayerNum ].bFirstID; bLoop <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; ++bLoop ) for( SoldierID OtherSoldier = gTacticalStatus.Team[ gbPlayerNum ].bFirstID; OtherSoldier <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; ++OtherSoldier )
{ {
SOLDIERTYPE* pOtherSoldier = MercPtrs[ bLoop ]; if ( CanCharacterRepairAnotherSoldiersStuff( pSoldier, OtherSoldier ) )
if ( CanCharacterRepairAnotherSoldiersStuff( pSoldier, pOtherSoldier ) )
{ {
// okay, seems like a candidate! Check if he has anything that needs unjamming or repairs // okay, seems like a candidate! Check if he has anything that needs unjamming or repairs
// CHRISL: Changed to dynamically determine max inventory locations. // CHRISL: Changed to dynamically determine max inventory locations.
for ( bPocket = HANDPOS; bPocket < NUM_INV_SLOTS; ++bPocket ) for ( bPocket = HANDPOS; bPocket < NUM_INV_SLOTS; ++bPocket )
{ {
// the object a weapon? and jammed? // the object a weapon? and jammed?
if ( ( Item[ pOtherSoldier->inv[ bPocket ].usItem ].usItemClass == IC_GUN ) && ( pOtherSoldier->inv[ bPocket ][0]->data.gun.bGunAmmoStatus < 0 ) ) if ( ( Item[ OtherSoldier->inv[ bPocket ].usItem ].usItemClass == IC_GUN ) && ( OtherSoldier->inv[ bPocket ][0]->data.gun.bGunAmmoStatus < 0 ) )
{ {
return( TRUE ); return( TRUE );
} }
@@ -1356,7 +1354,7 @@ BOOLEAN DoesCharacterHaveAnyItemsToRepair( SOLDIERTYPE *pSoldier, INT8 bHighestP
// repair everyone's hands and armor slots first, then headgear, and pockets last // repair everyone's hands and armor slots first, then headgear, and pockets last
for ( ubPassType = REPAIR_HANDS_AND_ARMOR; ubPassType <= ( UINT8 ) bHighestPass; ubPassType++ ) for ( ubPassType = REPAIR_HANDS_AND_ARMOR; ubPassType <= ( UINT8 ) bHighestPass; ubPassType++ )
{ {
if (FindRepairableItemOnOtherSoldier( pSoldier, pOtherSoldier, ubPassType )) { if (FindRepairableItemOnOtherSoldier( pSoldier, OtherSoldier, ubPassType )) {
return( TRUE ); return( TRUE );
} }
} }
@@ -2054,17 +2052,16 @@ BOOLEAN DoesSectorMercIsInHaveSufficientLoyaltyToTrainMilitia( SOLDIERTYPE *pSol
INT8 CountMilitiaTrainersInSoldiersSector( SOLDIERTYPE * pSoldier, UINT8 ubMilitiaType ) INT8 CountMilitiaTrainersInSoldiersSector( SOLDIERTYPE * pSoldier, UINT8 ubMilitiaType )
{ {
INT8 bCount = 0; INT8 bCount = 0;
AssertNotNIL(pSoldier); AssertNotNIL(pSoldier);
for ( UINT16 bLoop = gTacticalStatus.Team[ gbPlayerNum ].bFirstID; bLoop <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; ++bLoop ) for ( SoldierID OtherSoldier = gTacticalStatus.Team[ gbPlayerNum ].bFirstID; OtherSoldier <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; ++OtherSoldier )
{ {
SOLDIERTYPE* pOtherSoldier = MercPtrs[ bLoop ]; if ( pSoldier != OtherSoldier && OtherSoldier->bActive && OtherSoldier->stats.bLife >= OKLIFE && OtherSoldier->sSectorX == pSoldier->sSectorX && OtherSoldier->sSectorY == pSoldier->sSectorY && pSoldier->bSectorZ == OtherSoldier->bSectorZ )
if ( pSoldier != pOtherSoldier && pOtherSoldier->bActive && pOtherSoldier->stats.bLife >= OKLIFE && pOtherSoldier->sSectorX == pSoldier->sSectorX && pOtherSoldier->sSectorY == pSoldier->sSectorY && pSoldier->bSectorZ == pOtherSoldier->bSectorZ )
{ {
// Count depends on Militia Type requested // Count depends on Militia Type requested
if (ubMilitiaType == TOWN_MILITIA && pOtherSoldier->bAssignment == TRAIN_TOWN ) if (ubMilitiaType == TOWN_MILITIA && OtherSoldier->bAssignment == TRAIN_TOWN )
{ {
++bCount; ++bCount;
} }
@@ -3638,15 +3635,13 @@ UINT32 CalculateAllGuardsValueInPrison( INT16 sMapX, INT16 sMapY, INT8 bZ )
UINT32 prisonguardvalue = 0; UINT32 prisonguardvalue = 0;
// count any mercs found here, and sum up their guard values // count any mercs found here, and sum up their guard values
SOLDIERTYPE *pSoldier = NULL; SoldierID Soldier = gTacticalStatus.Team[ OUR_TEAM ].bFirstID;
UINT32 uiCnt = 0; SoldierID lastid = gTacticalStatus.Team[ OUR_TEAM ].bLastID;
UINT32 firstid = gTacticalStatus.Team[ OUR_TEAM ].bFirstID; for ( ; Soldier <= lastid; ++Soldier)
UINT32 lastid = gTacticalStatus.Team[ OUR_TEAM ].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[ uiCnt ]; uiCnt <= lastid; ++uiCnt, ++pSoldier)
{ {
if( pSoldier->bActive && ( pSoldier->sSectorX == sMapX ) && ( pSoldier->sSectorY == sMapY ) && ( pSoldier->bSectorZ == bZ) ) if( Soldier->bActive && ( Soldier->sSectorX == sMapX ) && ( Soldier->sSectorY == sMapY ) && ( Soldier->bSectorZ == bZ) )
{ {
prisonguardvalue += CalculatePrisonGuardValue(pSoldier ); prisonguardvalue += CalculatePrisonGuardValue( Soldier );
} }
} }
@@ -3661,15 +3656,13 @@ UINT32 CalculateAllSnitchesGuardValueInPrison( INT16 sMapX, INT16 sMapY, INT8 bZ
UINT32 prisonguardvalue = 0; UINT32 prisonguardvalue = 0;
// count any mercs found here, and sum up their guard values // count any mercs found here, and sum up their guard values
SOLDIERTYPE *pSoldier = NULL; SoldierID Soldier = gTacticalStatus.Team[ OUR_TEAM ].bFirstID;
UINT32 uiCnt = 0; SoldierID lastid = gTacticalStatus.Team[ OUR_TEAM ].bLastID;
UINT32 firstid = gTacticalStatus.Team[ OUR_TEAM ].bFirstID; for ( ; Soldier <= lastid; ++Soldier)
UINT32 lastid = gTacticalStatus.Team[ OUR_TEAM ].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[ uiCnt ]; uiCnt <= lastid; ++uiCnt, ++pSoldier)
{ {
if( pSoldier->bActive && ( pSoldier->sSectorX == sMapX ) && ( pSoldier->sSectorY == sMapY ) && ( pSoldier->bSectorZ == bZ) && pSoldier->flags.fMercAsleep == FALSE ) if( Soldier->bActive && ( Soldier->sSectorX == sMapX ) && ( Soldier->sSectorY == sMapY ) && ( Soldier->bSectorZ == bZ) && Soldier->flags.fMercAsleep == FALSE )
{ {
prisonguardvalue += CalculateSnitchGuardValue(pSoldier ); prisonguardvalue += CalculateSnitchGuardValue(Soldier );
} }
} }
@@ -3684,16 +3677,14 @@ UINT32 CalculateAllGuardsNumberInPrison( INT16 sMapX, INT16 sMapY, INT8 bZ )
UINT8 numprisonguards = 0; UINT8 numprisonguards = 0;
// count any mercs found here // count any mercs found here
SOLDIERTYPE *pSoldier = NULL; SoldierID Soldier = gTacticalStatus.Team[OUR_TEAM].bFirstID;
UINT32 uiCnt = 0; SoldierID lastid = gTacticalStatus.Team[OUR_TEAM].bLastID;
UINT32 firstid = gTacticalStatus.Team[ OUR_TEAM ].bFirstID; for ( ; Soldier <= lastid; ++Soldier)
UINT32 lastid = gTacticalStatus.Team[ OUR_TEAM ].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[ uiCnt ]; uiCnt <= lastid; ++uiCnt, ++pSoldier)
{ {
if( pSoldier->bActive && ( pSoldier->sSectorX == sMapX ) && ( pSoldier->sSectorY == sMapY ) && ( pSoldier->bSectorZ == bZ) && pSoldier->flags.fMercAsleep == FALSE ) if( Soldier->bActive && ( Soldier->sSectorX == sMapX ) && ( Soldier->sSectorY == sMapY ) && ( Soldier->bSectorZ == bZ) && Soldier->flags.fMercAsleep == FALSE )
{ {
// anv: undercover snitches don't count as guards as they don't guard in traditional sense // anv: undercover snitches don't count as guards as they don't guard in traditional sense
if ( !(pSoldier->bAssignment == FACILITY_PRISON_SNITCH) ) if ( !(Soldier->bAssignment == FACILITY_PRISON_SNITCH) )
++numprisonguards; ++numprisonguards;
} }
} }
@@ -5483,12 +5474,12 @@ void HandleRepairBySoldier( SOLDIERTYPE *pSoldier )
// first our own stuff // first our own stuff
CollectCleanableItems(pSoldier, pSoldier, itemsToClean); CollectCleanableItems(pSoldier, pSoldier, itemsToClean);
// then other mercs' stuff // then other mercs' stuff
for(UINT16 teamIndex = gTacticalStatus.Team[gbPlayerNum].bFirstID; teamIndex <= gTacticalStatus.Team[gbPlayerNum].bLastID; ++teamIndex) for(SoldierID teamMember = gTacticalStatus.Team[gbPlayerNum].bFirstID; teamMember <= gTacticalStatus.Team[gbPlayerNum].bLastID; ++teamMember)
{ {
// Ignore self, mercs in other sectors, etc. // Ignore self, mercs in other sectors, etc.
if (CanCharacterRepairAnotherSoldiersStuff(pSoldier, MercPtrs[teamIndex])) if (CanCharacterRepairAnotherSoldiersStuff(pSoldier, teamMember))
// silversurfer: This function now needs the guy that does the repairs and the one that owns the stuff. // silversurfer: This function now needs the guy that does the repairs and the one that owns the stuff.
CollectCleanableItems(pSoldier, MercPtrs[teamIndex], itemsToClean); CollectCleanableItems(pSoldier, teamMember, itemsToClean);
} }
while (!itemsToClean.empty() && ubCleaningPtsLeft > 0) while (!itemsToClean.empty() && ubCleaningPtsLeft > 0)
@@ -5528,12 +5519,12 @@ void HandleRepairBySoldier( SOLDIERTYPE *pSoldier )
// silversurfer: Looks strange? It's not. This function now needs the guy that does the repairs and the one that owns the stuff. // silversurfer: Looks strange? It's not. This function now needs the guy that does the repairs and the one that owns the stuff.
CollectRepairableItems(pSoldier, pSoldier, itemsToFix); CollectRepairableItems(pSoldier, pSoldier, itemsToFix);
for(UINT16 teamIndex = gTacticalStatus.Team[gbPlayerNum].bFirstID; teamIndex <= gTacticalStatus.Team[gbPlayerNum].bLastID; ++teamIndex) for(SoldierID teamMember = gTacticalStatus.Team[gbPlayerNum].bFirstID; teamMember <= gTacticalStatus.Team[gbPlayerNum].bLastID; ++teamMember)
{ {
// Ignore self, mercs in other sectors, etc. // Ignore self, mercs in other sectors, etc.
if (CanCharacterRepairAnotherSoldiersStuff(pSoldier, MercPtrs[teamIndex])) if (CanCharacterRepairAnotherSoldiersStuff(pSoldier, teamMember))
// silversurfer: This function now needs the guy that does the repairs and the one that owns the stuff. // silversurfer: This function now needs the guy that does the repairs and the one that owns the stuff.
CollectRepairableItems(pSoldier, MercPtrs[teamIndex], itemsToFix); CollectRepairableItems(pSoldier, teamMember, itemsToFix);
} }
// Step through items, starting with the highest priority item // Step through items, starting with the highest priority item
@@ -6708,17 +6699,15 @@ void HandleStrategicDiseaseAndBurial()
// Flugente: handle militia command // Flugente: handle militia command
void HandleMilitiaCommand() void HandleMilitiaCommand()
{ {
SOLDIERTYPE *pSoldier = NULL; SoldierID soldier = gTacticalStatus.Team[gbPlayerNum].bFirstID;
UINT32 uiCnt = 0; SoldierID lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
UINT32 firstid = gTacticalStatus.Team[gbPlayerNum].bFirstID; for ( ; soldier <= lastid; ++soldier)
UINT32 lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[ uiCnt ]; uiCnt <= lastid; ++uiCnt, ++pSoldier)
{ {
if( pSoldier && pSoldier->bAssignment == FACILITY_STRATEGIC_MILITIA_MOVEMENT && pSoldier->flags.fMercAsleep == FALSE ) if( soldier->bAssignment == FACILITY_STRATEGIC_MILITIA_MOVEMENT && soldier->flags.fMercAsleep == FALSE )
{ {
// every commander gets a bit of leadership and wisdom // every commander gets a bit of leadership and wisdom
StatChange( pSoldier, LDRAMT, 2, TRUE ); StatChange( soldier, LDRAMT, 2, TRUE );
StatChange( pSoldier, WISDOMAMT, 1, TRUE ); StatChange( soldier, WISDOMAMT, 1, TRUE );
} }
} }
} }
@@ -6741,12 +6730,11 @@ void HandleSpyAssignments()
std::vector<UINT16> vector_uncoveredmercs; std::vector<UINT16> vector_uncoveredmercs;
FLOAT intelgained = 0.0f; FLOAT intelgained = 0.0f;
SOLDIERTYPE *pSoldier = NULL; SoldierID id = gTacticalStatus.Team[gbPlayerNum].bFirstID;
UINT32 uiCnt = 0; SoldierID lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
UINT32 firstid = gTacticalStatus.Team[gbPlayerNum].bFirstID; for ( ; id <= lastid; ++id)
UINT32 lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[uiCnt]; uiCnt <= lastid; ++uiCnt, ++pSoldier )
{ {
SOLDIERTYPE *pSoldier = id;
if ( pSoldier ) if ( pSoldier )
{ {
if ( SPY_LOCATION( pSoldier->bAssignment ) ) if ( SPY_LOCATION( pSoldier->bAssignment ) )
@@ -6781,7 +6769,7 @@ void HandleSpyAssignments()
{ {
// if we are already in hiding, we will be uncovered // if we are already in hiding, we will be uncovered
if ( pSoldier->usSkillCooldown[SOLDIER_COOLDOWN_INTEL_PENALTY] > 10 ) if ( pSoldier->usSkillCooldown[SOLDIER_COOLDOWN_INTEL_PENALTY] > 10 )
vector_uncoveredmercs.push_back( uiCnt ); vector_uncoveredmercs.push_back( id );
// we get a penalty, and a chance to be uncovered // we get a penalty, and a chance to be uncovered
pSoldier->usSkillCooldown[SOLDIER_COOLDOWN_INTEL_PENALTY] += 20 + Random( 30 ); pSoldier->usSkillCooldown[SOLDIER_COOLDOWN_INTEL_PENALTY] += 20 + Random( 30 );
@@ -6845,16 +6833,14 @@ struct admintmpstruct
UINT16 GetNumberofAdministratableMercs( INT16 sX, INT16 sY ) UINT16 GetNumberofAdministratableMercs( INT16 sX, INT16 sY )
{ {
UINT16 num = 0; UINT16 num = 0;
UINT8 townid_origin = GetTownIdForSector( sX, sY ); UINT8 townid_origin = GetTownIdForSector( sX, sY );
SOLDIERTYPE *pSoldier = NULL; SoldierID id = gTacticalStatus.Team[gbPlayerNum].bFirstID;
UINT32 uiCnt = 0; SoldierID lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
UINT32 firstid = gTacticalStatus.Team[gbPlayerNum].bFirstID; for ( ; id <= lastid; ++id )
UINT32 lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[uiCnt]; uiCnt <= lastid; ++uiCnt, ++pSoldier )
{ {
if ( pSoldier SOLDIERTYPE *pSoldier = id;
if ( pSoldier
&& !pSoldier->flags.fMercAsleep && !pSoldier->flags.fMercAsleep
&& !pSoldier->bSectorZ && !pSoldier->bSectorZ
&& EnoughTimeOnAssignment( pSoldier ) && EnoughTimeOnAssignment( pSoldier )
@@ -6887,12 +6873,11 @@ FLOAT GetAdministrationPercentage( INT16 sX, INT16 sY )
data.townid = GetTownIdForSector( sX, sY ); data.townid = GetTownIdForSector( sX, sY );
// loop over all soldiers with this assignment, determine percentage applied, determine how much of total that is, award exp points // loop over all soldiers with this assignment, determine percentage applied, determine how much of total that is, award exp points
SOLDIERTYPE *pSoldier = NULL; SoldierID id = gTacticalStatus.Team[gbPlayerNum].bFirstID;
UINT32 uiCnt = 0; SoldierID lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
UINT32 firstid = gTacticalStatus.Team[gbPlayerNum].bFirstID; for ( ; id <= lastid; ++id )
UINT32 lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[uiCnt]; uiCnt <= lastid; ++uiCnt, ++pSoldier )
{ {
SOLDIERTYPE *pSoldier = id;
if ( pSoldier && pSoldier->bAssignment == ADMINISTRATION && !pSoldier->flags.fMercAsleep && EnoughTimeOnAssignment( pSoldier ) ) if ( pSoldier && pSoldier->bAssignment == ADMINISTRATION && !pSoldier->flags.fMercAsleep && EnoughTimeOnAssignment( pSoldier ) )
{ {
// sum up the points for towns, if not a town, for sectors // sum up the points for towns, if not a town, for sectors
@@ -6918,12 +6903,11 @@ void HandleAdministrationAssignments()
std::vector<admintmpstruct> helpervec; std::vector<admintmpstruct> helpervec;
// loop over all soldiers with this assignment, determine percentage applied, determine how much of total that is, award exp points // loop over all soldiers with this assignment, determine percentage applied, determine how much of total that is, award exp points
SOLDIERTYPE *pSoldier = NULL; SoldierID id = gTacticalStatus.Team[gbPlayerNum].bFirstID;
UINT32 uiCnt = 0; const SoldierID lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
UINT32 firstid = gTacticalStatus.Team[gbPlayerNum].bFirstID; for ( ; id <= lastid; ++id )
UINT32 lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[uiCnt]; uiCnt <= lastid; ++uiCnt, ++pSoldier )
{ {
SOLDIERTYPE *pSoldier = id;
if ( pSoldier && pSoldier->bAssignment == ADMINISTRATION && !pSoldier->flags.fMercAsleep && EnoughTimeOnAssignment( pSoldier ) ) if ( pSoldier && pSoldier->bAssignment == ADMINISTRATION && !pSoldier->flags.fMercAsleep && EnoughTimeOnAssignment( pSoldier ) )
{ {
// sum up the points for towns, if not a town, for sectors // sum up the points for towns, if not a town, for sectors
@@ -6967,8 +6951,10 @@ void HandleAdministrationAssignments()
} }
} }
for ( uiCnt = firstid, pSoldier = MercPtrs[uiCnt]; uiCnt <= lastid; ++uiCnt, ++pSoldier ) id = gTacticalStatus.Team[gbPlayerNum].bFirstID;
for ( ; id <= lastid; ++id )
{ {
SOLDIERTYPE *pSoldier = id;
if ( pSoldier && pSoldier->bAssignment == ADMINISTRATION && !pSoldier->flags.fMercAsleep && EnoughTimeOnAssignment( pSoldier ) ) if ( pSoldier && pSoldier->bAssignment == ADMINISTRATION && !pSoldier->flags.fMercAsleep && EnoughTimeOnAssignment( pSoldier ) )
{ {
UINT8 sector = SECTOR( pSoldier->sSectorX, pSoldier->sSectorY ); UINT8 sector = SECTOR( pSoldier->sSectorX, pSoldier->sSectorY );
@@ -7010,12 +6996,11 @@ void HandleAdministrationAssignments()
// Flugente: handle exploration assignments // Flugente: handle exploration assignments
void HandleExplorationAssignments() void HandleExplorationAssignments()
{ {
SOLDIERTYPE *pSoldier = NULL; SoldierID id = gTacticalStatus.Team[gbPlayerNum].bFirstID;
UINT32 uiCnt = 0; const SoldierID lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
UINT32 firstid = gTacticalStatus.Team[gbPlayerNum].bFirstID; for ( ; id <= lastid; ++id )
UINT32 lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[uiCnt]; uiCnt <= lastid; ++uiCnt, ++pSoldier )
{ {
SOLDIERTYPE *pSoldier = id;
if ( pSoldier && pSoldier->bAssignment == EXPLORATION && !pSoldier->flags.fMercAsleep && EnoughTimeOnAssignment( pSoldier ) ) if ( pSoldier && pSoldier->bAssignment == EXPLORATION && !pSoldier->flags.fMercAsleep && EnoughTimeOnAssignment( pSoldier ) )
{ {
UINT32 pts = pSoldier->GetExplorationPoints(); UINT32 pts = pSoldier->GetExplorationPoints();
@@ -7099,13 +7084,13 @@ void HandleExplorationAssignments()
void HandleMiniEventAssignments() void HandleMiniEventAssignments()
{ {
SOLDIERTYPE *pSoldier = NULL; SoldierID id = gTacticalStatus.Team[gbPlayerNum].bFirstID;
UINT32 uiCnt = 0; const SoldierID lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
const UINT32 firstid = gTacticalStatus.Team[gbPlayerNum].bFirstID;
const UINT32 lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[uiCnt]; uiCnt <= lastid; ++uiCnt, ++pSoldier ) for ( ; id <= lastid; ++id )
{ {
SOLDIERTYPE *pSoldier = id;
if ( pSoldier && pSoldier->bAssignment == ASSIGNMENT_MINIEVENT && EnoughTimeOnAssignment( pSoldier ) ) if ( pSoldier && pSoldier->bAssignment == ASSIGNMENT_MINIEVENT && EnoughTimeOnAssignment( pSoldier ) )
{ {
if (--pSoldier->ubHoursRemainingOnMiniEvent == 0) if (--pSoldier->ubHoursRemainingOnMiniEvent == 0)
@@ -8802,12 +8787,11 @@ void HandleEquipmentMove( INT16 sMapX, INT16 sMapY, INT8 bZ )
if ( (gWorldSectorX == sMapX) && (gWorldSectorY == sMapY) && (gbWorldSectorZ == bZ) ) if ( (gWorldSectorX == sMapX) && (gWorldSectorY == sMapY) && (gbWorldSectorZ == bZ) )
sDropOffGridNo = gMapInformation.sCenterGridNo; sDropOffGridNo = gMapInformation.sCenterGridNo;
SOLDIERTYPE *pSoldier = NULL; SoldierID id = gTacticalStatus.Team[gbPlayerNum].bFirstID;
UINT32 uiCnt = 0; const SoldierID lastid = gTacticalStatus.Team[gbPlayerNum].bLastID;
UINT32 firstid = gTacticalStatus.Team[ OUR_TEAM ].bFirstID; for ( ; id <= lastid; ++id )
UINT32 lastid = gTacticalStatus.Team[ OUR_TEAM ].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[ uiCnt ]; uiCnt <= lastid; ++uiCnt, ++pSoldier)
{ {
SOLDIERTYPE *pSoldier = id;
if( pSoldier->bActive && ( pSoldier->sSectorX == sMapX ) && ( pSoldier->sSectorY == sMapY ) && ( pSoldier->bSectorZ == bZ) && pSoldier->flags.fMercAsleep == FALSE ) if( pSoldier->bActive && ( pSoldier->sSectorX == sMapX ) && ( pSoldier->sSectorY == sMapY ) && ( pSoldier->bSectorZ == bZ) && pSoldier->flags.fMercAsleep == FALSE )
{ {
if( ( pSoldier->bAssignment == MOVE_EQUIPMENT ) && ( EnoughTimeOnAssignment( pSoldier ) ) ) if( ( pSoldier->bAssignment == MOVE_EQUIPMENT ) && ( EnoughTimeOnAssignment( pSoldier ) ) )
@@ -9048,8 +9032,11 @@ void HandleEquipmentMove( INT16 sMapX, INT16 sMapY, INT8 bZ )
// award a bit of experience to the movers // award a bit of experience to the movers
UINT16 itemsperperson = moveditems / pair.first; UINT16 itemsperperson = moveditems / pair.first;
UINT16 weightperperson = movedweight / pair.first; UINT16 weightperperson = movedweight / pair.first;
for ( uiCnt = firstid, pSoldier = MercPtrs[ uiCnt ]; uiCnt <= lastid; ++uiCnt, ++pSoldier)
SoldierID id = gTacticalStatus.Team[gbPlayerNum].bFirstID;
for ( ; id <= lastid; ++id)
{ {
SOLDIERTYPE *pSoldier = id;
if( pSoldier->bActive && ( pSoldier->sSectorX == sMapX ) && ( pSoldier->sSectorY == sMapY ) && ( pSoldier->bSectorZ == bZ) && pSoldier->flags.fMercAsleep == FALSE ) if( pSoldier->bActive && ( pSoldier->sSectorX == sMapX ) && ( pSoldier->sSectorY == sMapY ) && ( pSoldier->bSectorZ == bZ) && pSoldier->flags.fMercAsleep == FALSE )
{ {
if( ( pSoldier->bAssignment == MOVE_EQUIPMENT ) && ( EnoughTimeOnAssignment( pSoldier ) ) ) if( ( pSoldier->bAssignment == MOVE_EQUIPMENT ) && ( EnoughTimeOnAssignment( pSoldier ) ) )
@@ -9074,12 +9061,11 @@ void HandleTrainWorkers()
{ {
INT32 totalworkersadded = 0; INT32 totalworkersadded = 0;
SOLDIERTYPE *pSoldier = NULL; SoldierID id = gTacticalStatus.Team[OUR_TEAM].bFirstID;
UINT32 uiCnt = 0; const SoldierID lastid = gTacticalStatus.Team[OUR_TEAM].bLastID;
UINT32 firstid = gTacticalStatus.Team[ OUR_TEAM ].bFirstID; for ( ; id <= lastid; ++id)
UINT32 lastid = gTacticalStatus.Team[ OUR_TEAM ].bLastID;
for ( uiCnt = firstid, pSoldier = MercPtrs[ uiCnt ]; uiCnt <= lastid; ++uiCnt, ++pSoldier)
{ {
SOLDIERTYPE *pSoldier = id;
if( pSoldier->bActive && !pSoldier->bSectorZ && !pSoldier->flags.fMercAsleep ) if( pSoldier->bActive && !pSoldier->bSectorZ && !pSoldier->flags.fMercAsleep )
{ {
if( ( pSoldier->bAssignment == TRAIN_WORKERS ) && ( EnoughTimeOnAssignment( pSoldier ) ) ) if( ( pSoldier->bAssignment == TRAIN_WORKERS ) && ( EnoughTimeOnAssignment( pSoldier ) ) )
@@ -9507,13 +9493,13 @@ void HandleHealingByNaturalCauses( SOLDIERTYPE *pSoldier )
// SANDRO - experimental - increase health regeneration of soldiers when doctors are around // SANDRO - experimental - increase health regeneration of soldiers when doctors are around
if ( gGameOptions.fNewTraitSystem ) if ( gGameOptions.fNewTraitSystem )
{ {
SOLDIERTYPE * pMedic = NULL;
UINT16 cnt;
UINT16 bRegenerationBonus = 0; UINT16 bRegenerationBonus = 0;
cnt = gTacticalStatus.Team[ OUR_TEAM ].bFirstID; SoldierID id = gTacticalStatus.Team[OUR_TEAM].bFirstID;
for ( pMedic = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ OUR_TEAM ].bLastID; ++cnt, pMedic++) const SoldierID lastid = gTacticalStatus.Team[OUR_TEAM].bLastID;
for ( ; id <= lastid; ++id )
{ {
SOLDIERTYPE *pMedic = id;
if ( !(pMedic->bActive) || !(pMedic->bInSector) || ( pMedic->flags.uiStatusFlags & SOLDIER_VEHICLE ) || (pMedic->bAssignment == VEHICLE ) ) if ( !(pMedic->bActive) || !(pMedic->bInSector) || ( pMedic->flags.uiStatusFlags & SOLDIER_VEHICLE ) || (pMedic->bAssignment == VEHICLE ) )
{ {
continue; // NEXT!!! continue; // NEXT!!!
Tactical/End Game.cpp
+5 -4
View File
@@ -175,8 +175,7 @@ void BeginHandleDeidrannaDeath( SOLDIERTYPE *pKillerSoldier, INT32 sGridNo, INT8
void HandleDeidrannaDeath( SOLDIERTYPE *pKillerSoldier, INT32 sGridNo, INT8 bLevel ) void HandleDeidrannaDeath( SOLDIERTYPE *pKillerSoldier, INT32 sGridNo, INT8 bLevel )
{ {
SOLDIERTYPE *pTeamSoldier; SOLDIERTYPE *pTeamSoldier;
INT32 cnt; SoldierID ubKillerSoldierID = NOBODY;
UINT16 ubKillerSoldierID = NOBODY;
// Start victory music here... // Start victory music here...
SetMusicMode( MUSIC_TACTICAL_VICTORY ); SetMusicMode( MUSIC_TACTICAL_VICTORY );
@@ -189,11 +188,13 @@ void HandleDeidrannaDeath( SOLDIERTYPE *pKillerSoldier, INT32 sGridNo, INT8 bLev
// STEP 1 ) START ALL QUOTES GOING! // STEP 1 ) START ALL QUOTES GOING!
// OK - loop through all witnesses and see if they want to say something abou this... // OK - loop through all witnesses and see if they want to say something abou this...
cnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID; SoldierID cnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
// run through list // run through list
for ( pTeamSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; ++cnt,pTeamSoldier++ ) for ( ; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; ++cnt )
{ {
pTeamSoldier = cnt;
if ( cnt != ubKillerSoldierID ) if ( cnt != ubKillerSoldierID )
{ {
if ( OK_INSECTOR_MERC( pTeamSoldier ) && !( pTeamSoldier->flags.uiStatusFlags & SOLDIER_GASSED ) && !AM_AN_EPC( pTeamSoldier ) ) if ( OK_INSECTOR_MERC( pTeamSoldier ) && !( pTeamSoldier->flags.uiStatusFlags & SOLDIER_GASSED ) && !AM_AN_EPC( pTeamSoldier ) )