This commit is contained in:
Mr_Goldberg 2022-08-05 01:32:20 -04:00
parent 0fc5a564e1
commit ba877b6e78
No known key found for this signature in database
GPG key ID: 8597D87419DEF278
9 changed files with 44 additions and 1 deletions

View file

@ -2497,6 +2497,11 @@ STEAMAPI_API steam_bool SteamAPI_ISteamApps_BIsTimedTrial( ISteamApps* self, uin
return self->BIsTimedTrial(punSecondsAllowed, punSecondsPlayed); return self->BIsTimedTrial(punSecondsAllowed, punSecondsPlayed);
} }
STEAMAPI_API steam_bool SteamAPI_ISteamApps_SetDlcContext( ISteamApps* self, AppId_t nAppID )
{
return self->SetDlcContext(nAppID);
}
STEAMAPI_API ISteamNetworking *SteamAPI_SteamNetworking_v006() STEAMAPI_API ISteamNetworking *SteamAPI_SteamNetworking_v006()
{ {
return get_steam_client()->GetISteamNetworking(flat_hsteamuser(), flat_hsteampipe(), "SteamNetworking006"); return get_steam_client()->GetISteamNetworking(flat_hsteamuser(), flat_hsteampipe(), "SteamNetworking006");
@ -3288,6 +3293,11 @@ STEAMAPI_API uint16 SteamAPI_ISteamInput_GetSessionInputConfigurationSettings( I
return (get_steam_client()->steam_controller)->GetSessionInputConfigurationSettings(); return (get_steam_client()->steam_controller)->GetSessionInputConfigurationSettings();
} }
STEAMAPI_API void SteamAPI_ISteamInput_SetDualSenseTriggerEffect( ISteamInput* self, InputHandle_t inputHandle, const ScePadTriggerEffectParam * pParam )
{
return (get_steam_client()->steam_controller)->SetDualSenseTriggerEffect(inputHandle, pParam);
}
STEAMAPI_API ISteamController *SteamAPI_SteamController_v007() STEAMAPI_API ISteamController *SteamAPI_SteamController_v007()
{ {
return get_steam_client()->GetISteamController(flat_hsteamuser(), flat_hsteampipe(), "SteamController007"); return get_steam_client()->GetISteamController(flat_hsteamuser(), flat_hsteampipe(), "SteamController007");

View file

@ -337,3 +337,10 @@ bool Steam_Apps::BIsTimedTrial( uint32* punSecondsAllowed, uint32* punSecondsPla
PRINT_DEBUG("BIsTimedTrial\n"); PRINT_DEBUG("BIsTimedTrial\n");
return false; return false;
} }
// set current DLC AppID being played (or 0 if none). Allows Steam to track usage of major DLC extensions
bool Steam_Apps::SetDlcContext( AppId_t nAppID )
{
PRINT_DEBUG("SetDlcContext %u\n", nAppID);
return true;
}

View file

@ -106,4 +106,7 @@ public:
// check if game is a timed trial with limited playtime // check if game is a timed trial with limited playtime
bool BIsTimedTrial( uint32* punSecondsAllowed, uint32* punSecondsPlayed ); bool BIsTimedTrial( uint32* punSecondsAllowed, uint32* punSecondsPlayed );
// set current DLC AppID being played (or 0 if none). Allows Steam to track usage of major DLC extensions
bool SetDlcContext( AppId_t nAppID );
}; };

View file

@ -1231,6 +1231,12 @@ uint16 GetSessionInputConfigurationSettings()
return 0; return 0;
} }
// Set the trigger effect for a DualSense controller
void SetDualSenseTriggerEffect( InputHandle_t inputHandle, const ScePadTriggerEffectParam *pParam )
{
PRINT_DEBUG("TODO %s\n", __FUNCTION__);
}
void RunCallbacks() void RunCallbacks()
{ {
if (explicitly_call_run_frame) { if (explicitly_call_run_frame) {

View file

@ -108,6 +108,9 @@ public:
// check if game is a timed trial with limited playtime // check if game is a timed trial with limited playtime
virtual bool BIsTimedTrial( uint32* punSecondsAllowed, uint32* punSecondsPlayed ) = 0; virtual bool BIsTimedTrial( uint32* punSecondsAllowed, uint32* punSecondsPlayed ) = 0;
// set current DLC AppID being played (or 0 if none). Allows Steam to track usage of major DLC extensions
virtual bool SetDlcContext( AppId_t nAppID ) = 0;
}; };
#define STEAMAPPS_INTERFACE_VERSION "STEAMAPPS_INTERFACE_VERSION008" #define STEAMAPPS_INTERFACE_VERSION "STEAMAPPS_INTERFACE_VERSION008"

View file

@ -704,6 +704,11 @@ struct SteamInputActionEvent_t
} x; } x;
}; };
//-----------------------------------------------------------------------------
// Forward declaration for ScePadTriggerEffectParam, defined in isteamdualsense.h
//-----------------------------------------------------------------------------
struct ScePadTriggerEffectParam;
#pragma pack( pop ) #pragma pack( pop )
typedef void ( *SteamInputActionEventCallbackPointer )( SteamInputActionEvent_t * ); typedef void ( *SteamInputActionEventCallbackPointer )( SteamInputActionEvent_t * );
@ -917,6 +922,9 @@ public:
// Get a bitmask of the Steam Input Configuration types opted in for the current session. Returns ESteamInputConfigurationEnableType values.? // Get a bitmask of the Steam Input Configuration types opted in for the current session. Returns ESteamInputConfigurationEnableType values.?
// Note: user can override the settings from the Steamworks Partner site so the returned values may not exactly match your default configuration // Note: user can override the settings from the Steamworks Partner site so the returned values may not exactly match your default configuration
virtual uint16 GetSessionInputConfigurationSettings() = 0; virtual uint16 GetSessionInputConfigurationSettings() = 0;
// Set the trigger effect for a DualSense controller
virtual void SetDualSenseTriggerEffect( InputHandle_t inputHandle, const ScePadTriggerEffectParam *pParam ) = 0;
}; };
#define STEAMINPUT_INTERFACE_VERSION "SteamInput006" #define STEAMINPUT_INTERFACE_VERSION "SteamInput006"

View file

@ -477,6 +477,8 @@ STEAMAPI_API SteamAPICall_t SteamAPI_ISteamApps_GetFileDetails( ISteamApps* self
STEAMAPI_API int SteamAPI_ISteamApps_GetLaunchCommandLine( ISteamApps* self, char * pszCommandLine, int cubCommandLine ); STEAMAPI_API int SteamAPI_ISteamApps_GetLaunchCommandLine( ISteamApps* self, char * pszCommandLine, int cubCommandLine );
STEAMAPI_API steam_bool SteamAPI_ISteamApps_BIsSubscribedFromFamilySharing( ISteamApps* self ); STEAMAPI_API steam_bool SteamAPI_ISteamApps_BIsSubscribedFromFamilySharing( ISteamApps* self );
STEAMAPI_API steam_bool SteamAPI_ISteamApps_BIsTimedTrial( ISteamApps* self, uint32 * punSecondsAllowed, uint32 * punSecondsPlayed ); STEAMAPI_API steam_bool SteamAPI_ISteamApps_BIsTimedTrial( ISteamApps* self, uint32 * punSecondsAllowed, uint32 * punSecondsPlayed );
STEAMAPI_API steam_bool SteamAPI_ISteamApps_SetDlcContext( ISteamApps* self, AppId_t nAppID );
// ISteamNetworking // ISteamNetworking
STEAMAPI_API ISteamNetworking *SteamAPI_SteamNetworking_v006(); STEAMAPI_API ISteamNetworking *SteamAPI_SteamNetworking_v006();
@ -647,6 +649,7 @@ STEAMAPI_API EInputActionOrigin SteamAPI_ISteamInput_TranslateActionOrigin( ISte
STEAMAPI_API steam_bool SteamAPI_ISteamInput_GetDeviceBindingRevision( ISteamInput* self, InputHandle_t inputHandle, int * pMajor, int * pMinor ); STEAMAPI_API steam_bool SteamAPI_ISteamInput_GetDeviceBindingRevision( ISteamInput* self, InputHandle_t inputHandle, int * pMajor, int * pMinor );
STEAMAPI_API uint32 SteamAPI_ISteamInput_GetRemotePlaySessionID( ISteamInput* self, InputHandle_t inputHandle ); STEAMAPI_API uint32 SteamAPI_ISteamInput_GetRemotePlaySessionID( ISteamInput* self, InputHandle_t inputHandle );
STEAMAPI_API uint16 SteamAPI_ISteamInput_GetSessionInputConfigurationSettings( ISteamInput* self ); STEAMAPI_API uint16 SteamAPI_ISteamInput_GetSessionInputConfigurationSettings( ISteamInput* self );
STEAMAPI_API void SteamAPI_ISteamInput_SetDualSenseTriggerEffect( ISteamInput* self, InputHandle_t inputHandle, const ScePadTriggerEffectParam * pParam );
// ISteamController // ISteamController
STEAMAPI_API ISteamController *SteamAPI_SteamController_v007(); STEAMAPI_API ISteamController *SteamAPI_SteamController_v007();

View file

@ -152,6 +152,7 @@ enum EResult
k_EResultInsufficientBattery = 124, // user device doesn't have enough battery charge currently to complete the action k_EResultInsufficientBattery = 124, // user device doesn't have enough battery charge currently to complete the action
k_EResultChargerRequired = 125, // The operation requires a charger to be plugged in, which wasn't present k_EResultChargerRequired = 125, // The operation requires a charger to be plugged in, which wasn't present
k_EResultCachedCredentialInvalid = 126, // Cached credential was invalid - user must reauthenticate k_EResultCachedCredentialInvalid = 126, // Cached credential was invalid - user must reauthenticate
K_EResultPhoneNumberIsVOIP = 127, // The phone number provided is a Voice Over IP number
}; };
// Error codes for use with the voice functions // Error codes for use with the voice functions

View file

@ -1718,7 +1718,9 @@ inline SteamNetworkingPOPID CalculateSteamNetworkingPOPIDFromString( const char
template <int N> template <int N>
inline void GetSteamNetworkingLocationPOPStringFromID( SteamNetworkingPOPID id, char (&szCode)[N] ) inline void GetSteamNetworkingLocationPOPStringFromID( SteamNetworkingPOPID id, char (&szCode)[N] )
{ {
#if !defined( __GNUC__ ) || __GNUC__ >= 5
static_assert( N >= 5, "Fixed-size buffer not big enough to hold SDR POP ID" ); static_assert( N >= 5, "Fixed-size buffer not big enough to hold SDR POP ID" );
#endif
szCode[0] = char( id >> 16U ); szCode[0] = char( id >> 16U );
szCode[1] = char( id >> 8U ); szCode[1] = char( id >> 8U );
szCode[2] = char( id ); szCode[2] = char( id );