mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
Import changes from the local SVN working copy
This commit is contained in:
+10
-10
@@ -77,18 +77,18 @@ void UpdateTEAMPanel( );
|
||||
*/
|
||||
BOOLEAN InitializeTEAMPanelCoords( );
|
||||
|
||||
void SetSMPanelCurrentMerc( UINT8 ubNewID );
|
||||
void SetTEAMPanelCurrentMerc( UINT8 ubNewID );
|
||||
void SetSMPanelCurrentMerc( UINT16 ubNewID );
|
||||
void SetTEAMPanelCurrentMerc( UINT16 ubNewID );
|
||||
UINT16 GetSMPanelCurrentMerc( );
|
||||
void UpdateSMPanel( );
|
||||
|
||||
BOOLEAN InitTEAMSlots( );
|
||||
void AddPlayerToInterfaceTeamSlot( UINT8 ubID );
|
||||
void AddPlayerToInterfaceTeamSlot( UINT16 ubID );
|
||||
BOOLEAN RemovePlayerFromInterfaceTeamSlot( UINT8 ubID );
|
||||
BOOLEAN GetPlayerIDFromInterfaceTeamSlot( UINT8 ubPanelSlot, UINT8 *pubID );
|
||||
BOOLEAN GetPlayerIDFromInterfaceTeamSlot( UINT8 ubPanelSlot, UINT16 * pubID );
|
||||
void RemoveAllPlayersFromSlot( );
|
||||
BOOLEAN PlayerExistsInSlot( UINT8 ubID );
|
||||
BOOLEAN RemovePlayerFromTeamSlotGivenMercID( UINT8 ubMercID );
|
||||
BOOLEAN PlayerExistsInSlot( UINT16 ubID );
|
||||
BOOLEAN RemovePlayerFromTeamSlotGivenMercID( UINT16 ubMercID );
|
||||
void CheckForAndAddMercToTeamPanel( SOLDIERTYPE *pSoldier );
|
||||
void CleanUpStack( OBJECTTYPE * pObj, OBJECTTYPE * pCursorObj );
|
||||
|
||||
@@ -107,8 +107,8 @@ extern INT8 gbNewItem[ NUM_INV_SLOTS ];
|
||||
extern INT8 gbNewItemCycle[ NUM_INV_SLOTS ];
|
||||
extern UINT8 gubNewItemMerc;
|
||||
|
||||
void ShowRadioLocator( UINT8 ubID, UINT8 ubLocatorSpeed );
|
||||
void EndRadioLocator( UINT8 ubID );
|
||||
void ShowRadioLocator( UINT16 ubID, UINT8 ubLocatorSpeed );
|
||||
void EndRadioLocator( UINT16 ubID );
|
||||
|
||||
|
||||
extern MOUSE_REGION gSMPanelRegion;
|
||||
@@ -118,7 +118,7 @@ extern BOOLEAN gfDisableTacticalPanelButtons;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
UINT8 ubID;
|
||||
UINT16 ubID;
|
||||
BOOLEAN fOccupied;
|
||||
|
||||
} TEAM_PANEL_SLOTS_TYPE;
|
||||
@@ -149,7 +149,7 @@ void GoToMapScreenFromTactical( void );
|
||||
|
||||
void FinishAnySkullPanelAnimations( );
|
||||
|
||||
UINT8 FindNextMercInTeamPanel( SOLDIERTYPE *pSoldier, BOOLEAN fGoodForLessOKLife, BOOLEAN fOnlyRegularMercs );
|
||||
UINT16 FindNextMercInTeamPanel( SOLDIERTYPE *pSoldier, BOOLEAN fGoodForLessOKLife, BOOLEAN fOnlyRegularMercs );
|
||||
|
||||
// CHRISL: New callback functions for backpack buttons
|
||||
BOOLEAN ChangeDropPackStatus(SOLDIERTYPE *pSoldier, BOOLEAN newStatus);
|
||||
|
||||
Reference in New Issue
Block a user