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

Convert to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-17 16:35:26 +02:00
parent 274be524e6
commit 2e147d4bd7
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+7 -7
View File
@@ -8799,7 +8799,7 @@ INT8 CalcSuppressionTolerance( SOLDIERTYPE * pSoldier )
extern void IncrementWatchedLoc(UINT16 ubID, INT32 sGridNo, INT8 bLevel); extern void IncrementWatchedLoc(UINT16 ubID, INT32 sGridNo, INT8 bLevel);
void HandleSuppressionFire( UINT16 ubTargetedMerc, UINT16 ubCausedAttacker ) void HandleSuppressionFire( SoldierID ubTargetedMerc, SoldierID ubCausedAttacker )
{ {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //
@@ -8831,7 +8831,7 @@ void HandleSuppressionFire( UINT16 ubTargetedMerc, UINT16 ubCausedAttacker )
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// SANDRO - modify suppression effectiveness based on weapon caliber (i.e. damage) // SANDRO - modify suppression effectiveness based on weapon caliber (i.e. damage)
INT16 sFinalSuppressionEffectiveness = gGameExternalOptions.sSuppressionEffectiveness; INT16 sFinalSuppressionEffectiveness = gGameExternalOptions.sSuppressionEffectiveness;
pAttacker = MercPtrs[ubCausedAttacker]; pAttacker = ubCausedAttacker;
if (pAttacker && pAttacker->inv[pAttacker->ubAttackingHand].exists() && Item[pAttacker->inv[pAttacker->ubAttackingHand].usItem].usItemClass == IC_GUN) if (pAttacker && pAttacker->inv[pAttacker->ubAttackingHand].exists() && Item[pAttacker->inv[pAttacker->ubAttackingHand].usItem].usItemClass == IC_GUN)
{ {
OBJECTTYPE *pWeapon = &pAttacker->inv[pAttacker->ubAttackingHand]; OBJECTTYPE *pWeapon = &pAttacker->inv[pAttacker->ubAttackingHand];
@@ -9577,11 +9577,11 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( )
// Strange as this may seem, this function returns a pointer to // Strange as this may seem, this function returns a pointer to
// the *target* in case the target has changed sides as a result // the *target* in case the target has changed sides as a result
// of being attacked // of being attacked
SOLDIERTYPE * pSoldier; SOLDIERTYPE *pSoldier;
SOLDIERTYPE * pTarget; SOLDIERTYPE *pTarget;
BOOLEAN fEnterCombat = FALSE; BOOLEAN fEnterCombat = FALSE;
UINT32 cnt; UINT32 cnt;
UINT16 ubID; SoldierID ubID;
// if ((gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT)) // if ((gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT))
Tactical/Soldier Control.cpp
+2 -2
View File
@@ -21415,12 +21415,12 @@ BOOLEAN SOLDIERTYPE::InPositionForTurncoatAttempt( UINT16 usID )
return FALSE; return FALSE;
} }
UINT8 SOLDIERTYPE::GetTurncoatConvinctionChance( UINT16 usID, INT16 sApproach ) UINT8 SOLDIERTYPE::GetTurncoatConvinctionChance( SoldierID usID, INT16 sApproach )
{ {
if ( usID >= NOBODY ) if ( usID >= NOBODY )
return 0; return 0;
SOLDIERTYPE* pSoldier = MercPtrs[usID]; SOLDIERTYPE* pSoldier = usID;
if ( !pSoldier if ( !pSoldier
|| pSoldier->bTeam != ENEMY_TEAM ) || pSoldier->bTeam != ENEMY_TEAM )
Tactical/Soldier Control.h
+1 -1
View File
@@ -2087,7 +2087,7 @@ public:
// Flugente: turncoats // Flugente: turncoats
BOOLEAN InPositionForTurncoatAttempt( UINT16 usID ); BOOLEAN InPositionForTurncoatAttempt( UINT16 usID );
UINT8 GetTurncoatConvinctionChance( UINT16 usID, INT16 usApproach ); UINT8 GetTurncoatConvinctionChance( SoldierID usID, INT16 usApproach );
void AttemptToCreateTurncoat( UINT16 usID ); void AttemptToCreateTurncoat( UINT16 usID );
BOOLEAN OrderTurnCoatToSwitchSides( UINT16 usID ); BOOLEAN OrderTurnCoatToSwitchSides( UINT16 usID );
void OrderAllTurnCoatToSwitchSides(); void OrderAllTurnCoatToSwitchSides();