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

Use SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-21 21:29:28 +02:00
parent 0dc2ceabb2
commit 67c8081104
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Merc Contract.cpp
+4 -4
View File
@@ -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 // We wish to lock interface
SpecialCharacterDialogueEvent( DIALOGUE_SPECIAL_EVENT_LOCK_INTERFACE,1,MAP_SCREEN,0,0,0 ); 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 // We wish to lock interface
SpecialCharacterDialogueEvent( DIALOGUE_SPECIAL_EVENT_LOCK_INTERFACE,1,MAP_SCREEN,0,0,0 ); SpecialCharacterDialogueEvent( DIALOGUE_SPECIAL_EVENT_LOCK_INTERFACE,1,MAP_SCREEN,0,0,0 );
Strategic/Merc Contract.h
+2 -2
View File
@@ -68,8 +68,8 @@ void FindOutIfAnyMercAboutToLeaveIsGonnaRenew( void );
void BeginContractRenewalSequence( ); void BeginContractRenewalSequence( );
void HandleContractRenewalSequence( ); void HandleContractRenewalSequence( );
void EndCurrentContractRenewal( ); void EndCurrentContractRenewal( );
void HandleMercIsWillingToRenew( UINT16 ubID ); void HandleMercIsWillingToRenew( SoldierID ubID );
void HandleMercIsNotWillingToRenew( UINT16 ubID ); void HandleMercIsNotWillingToRenew( SoldierID ubID );
BOOLEAN ContractIsExpiring( SOLDIERTYPE *pSoldier ); BOOLEAN ContractIsExpiring( SOLDIERTYPE *pSoldier );
UINT32 GetHourWhenContractDone( SOLDIERTYPE *pSoldier ); UINT32 GetHourWhenContractDone( SOLDIERTYPE *pSoldier );