diff --git a/Strategic/Game Event Hook.cpp b/Strategic/Game Event Hook.cpp index 14d920d2..3a8b9df9 100644 --- a/Strategic/Game Event Hook.cpp +++ b/Strategic/Game Event Hook.cpp @@ -251,7 +251,7 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent ) break; //When a merc is supposed to leave case EVENT_MERC_CONTRACT_OVER: - MercsContractIsFinished( (UINT8) pEvent->uiParam ); + MercsContractIsFinished( pEvent->uiParam ); break; case EVENT_ADDSOLDIER_TO_UPDATE_BOX: { @@ -432,7 +432,7 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent ) BeginContractRenewalSequence( ); break; case EVENT_RPC_WHINE_ABOUT_PAY: - RPCWhineAboutNoPay( (UINT8) pEvent->uiParam ); + RPCWhineAboutNoPay( pEvent->uiParam ); break; case EVENT_HAVENT_MADE_IMP_CHARACTER_EMAIL: diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp index e6cae0b5..f510e653 100644 --- a/Strategic/Strategic Merc Handler.cpp +++ b/Strategic/Strategic Merc Handler.cpp @@ -721,11 +721,9 @@ void HandleMercsAboutToLeave( SOLDIERTYPE *pMercList ) // ATE: This function deals with MERC MERC and NPC's leaving because of not getting paid... // NOT AIM renewals.... -void MercsContractIsFinished( UINT16 ubID ) +void MercsContractIsFinished( SoldierID ubID ) { - SOLDIERTYPE *pSoldier; - - pSoldier = &Menptr[ ubID ]; + SOLDIERTYPE *pSoldier = ubID; //if the soldier was removed before getting into this function, return if( !pSoldier->bActive ) @@ -775,11 +773,9 @@ void MercsContractIsFinished( UINT16 ubID ) } // ATE: Called for RPCs who should now complain about no pay... -void RPCWhineAboutNoPay( UINT16 ubID ) +void RPCWhineAboutNoPay( SoldierID ubID ) { - SOLDIERTYPE *pSoldier; - - pSoldier = &Menptr[ ubID ]; + SOLDIERTYPE *pSoldier = ubID; //if the soldier was removed before getting into this function, return if( !pSoldier->bActive ) diff --git a/Strategic/Strategic Merc Handler.h b/Strategic/Strategic Merc Handler.h index 2ea34e9f..4e878f2f 100644 --- a/Strategic/Strategic Merc Handler.h +++ b/Strategic/Strategic Merc Handler.h @@ -3,11 +3,12 @@ //forward declarations of common classes to eliminate includes class SOLDIERTYPE; +struct SoldierID; void StrategicHandlePlayerTeamMercDeath( SOLDIERTYPE *pSoldier ); void MercDailyUpdate(); -void MercsContractIsFinished( UINT16 ubID ); -void RPCWhineAboutNoPay( UINT16 ubID ); +void MercsContractIsFinished( SoldierID ubID ); +void RPCWhineAboutNoPay( SoldierID ubID ); void MercComplainAboutEquipment( UINT8 ubProfileID ); BOOLEAN SoldierHasWorseEquipmentThanUsedTo( SOLDIERTYPE *pSoldier ); void UpdateBuddyAndHatedCounters( void );