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-20 20:12:05 +02:00
parent 8e4307b2fb
commit bb1c63d4e8
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Game Event Hook.cpp
+2 -2
View File
@@ -251,7 +251,7 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
break; break;
//When a merc is supposed to leave //When a merc is supposed to leave
case EVENT_MERC_CONTRACT_OVER: case EVENT_MERC_CONTRACT_OVER:
MercsContractIsFinished( (UINT8) pEvent->uiParam ); MercsContractIsFinished( pEvent->uiParam );
break; break;
case EVENT_ADDSOLDIER_TO_UPDATE_BOX: case EVENT_ADDSOLDIER_TO_UPDATE_BOX:
{ {
@@ -432,7 +432,7 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
BeginContractRenewalSequence( ); BeginContractRenewalSequence( );
break; break;
case EVENT_RPC_WHINE_ABOUT_PAY: case EVENT_RPC_WHINE_ABOUT_PAY:
RPCWhineAboutNoPay( (UINT8) pEvent->uiParam ); RPCWhineAboutNoPay( pEvent->uiParam );
break; break;
case EVENT_HAVENT_MADE_IMP_CHARACTER_EMAIL: case EVENT_HAVENT_MADE_IMP_CHARACTER_EMAIL:
Strategic/Strategic Merc Handler.cpp
+4 -8
View File
@@ -721,11 +721,9 @@ void HandleMercsAboutToLeave( SOLDIERTYPE *pMercList )
// ATE: This function deals with MERC MERC and NPC's leaving because of not getting paid... // ATE: This function deals with MERC MERC and NPC's leaving because of not getting paid...
// NOT AIM renewals.... // NOT AIM renewals....
void MercsContractIsFinished( UINT16 ubID ) void MercsContractIsFinished( SoldierID ubID )
{ {
SOLDIERTYPE *pSoldier; SOLDIERTYPE *pSoldier = ubID;
pSoldier = &Menptr[ ubID ];
//if the soldier was removed before getting into this function, return //if the soldier was removed before getting into this function, return
if( !pSoldier->bActive ) if( !pSoldier->bActive )
@@ -775,11 +773,9 @@ void MercsContractIsFinished( UINT16 ubID )
} }
// ATE: Called for RPCs who should now complain about no pay... // ATE: Called for RPCs who should now complain about no pay...
void RPCWhineAboutNoPay( UINT16 ubID ) void RPCWhineAboutNoPay( SoldierID ubID )
{ {
SOLDIERTYPE *pSoldier; SOLDIERTYPE *pSoldier = ubID;
pSoldier = &Menptr[ ubID ];
//if the soldier was removed before getting into this function, return //if the soldier was removed before getting into this function, return
if( !pSoldier->bActive ) if( !pSoldier->bActive )
Strategic/Strategic Merc Handler.h
+3 -2
View File
@@ -3,11 +3,12 @@
//forward declarations of common classes to eliminate includes //forward declarations of common classes to eliminate includes
class SOLDIERTYPE; class SOLDIERTYPE;
struct SoldierID;
void StrategicHandlePlayerTeamMercDeath( SOLDIERTYPE *pSoldier ); void StrategicHandlePlayerTeamMercDeath( SOLDIERTYPE *pSoldier );
void MercDailyUpdate(); void MercDailyUpdate();
void MercsContractIsFinished( UINT16 ubID ); void MercsContractIsFinished( SoldierID ubID );
void RPCWhineAboutNoPay( UINT16 ubID ); void RPCWhineAboutNoPay( SoldierID ubID );
void MercComplainAboutEquipment( UINT8 ubProfileID ); void MercComplainAboutEquipment( UINT8 ubProfileID );
BOOLEAN SoldierHasWorseEquipmentThanUsedTo( SOLDIERTYPE *pSoldier ); BOOLEAN SoldierHasWorseEquipmentThanUsedTo( SOLDIERTYPE *pSoldier );
void UpdateBuddyAndHatedCounters( void ); void UpdateBuddyAndHatedCounters( void );