diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index c0f4e4e2..848213e9 100644 --- a/Strategic/Merc Contract.cpp +++ b/Strategic/Merc Contract.cpp @@ -282,9 +282,9 @@ void EndCurrentContractRenewal( ) } } -void HandleMercIsWillingToRenew( UINT16 ubID ) +void HandleMercIsWillingToRenew( SoldierID ubID ) { - SOLDIERTYPE *pSoldier = MercPtrs[ ubID ]; + SOLDIERTYPE *pSoldier = ubID; // We wish to lock interface SpecialCharacterDialogueEvent( DIALOGUE_SPECIAL_EVENT_LOCK_INTERFACE,1,MAP_SCREEN,0,0,0 ); @@ -302,9 +302,9 @@ void HandleMercIsWillingToRenew( UINT16 ubID ) } -void HandleMercIsNotWillingToRenew( UINT16 ubID ) +void HandleMercIsNotWillingToRenew( SoldierID ubID ) { - SOLDIERTYPE *pSoldier = MercPtrs[ ubID ]; + SOLDIERTYPE *pSoldier = ubID; // We wish to lock interface SpecialCharacterDialogueEvent( DIALOGUE_SPECIAL_EVENT_LOCK_INTERFACE,1,MAP_SCREEN,0,0,0 ); diff --git a/Strategic/Merc Contract.h b/Strategic/Merc Contract.h index abfc0ec5..dd6ccf4f 100644 --- a/Strategic/Merc Contract.h +++ b/Strategic/Merc Contract.h @@ -68,8 +68,8 @@ void FindOutIfAnyMercAboutToLeaveIsGonnaRenew( void ); void BeginContractRenewalSequence( ); void HandleContractRenewalSequence( ); void EndCurrentContractRenewal( ); -void HandleMercIsWillingToRenew( UINT16 ubID ); -void HandleMercIsNotWillingToRenew( UINT16 ubID ); +void HandleMercIsWillingToRenew( SoldierID ubID ); +void HandleMercIsNotWillingToRenew( SoldierID ubID ); BOOLEAN ContractIsExpiring( SOLDIERTYPE *pSoldier ); UINT32 GetHourWhenContractDone( SOLDIERTYPE *pSoldier );