diff --git a/Facepunch.Steamworks.Test/steam_api.dll b/Facepunch.Steamworks.Test/steam_api.dll index 8fb32b4..e2b2db0 100644 Binary files a/Facepunch.Steamworks.Test/steam_api.dll and b/Facepunch.Steamworks.Test/steam_api.dll differ diff --git a/Facepunch.Steamworks.Test/steam_api64.dll b/Facepunch.Steamworks.Test/steam_api64.dll index c6e55cf..7190117 100644 Binary files a/Facepunch.Steamworks.Test/steam_api64.dll and b/Facepunch.Steamworks.Test/steam_api64.dll differ diff --git a/Facepunch.Steamworks/Generated/CustomEnums.cs b/Facepunch.Steamworks/Generated/CustomEnums.cs index 6d85281..021e711 100644 --- a/Facepunch.Steamworks/Generated/CustomEnums.cs +++ b/Facepunch.Steamworks/Generated/CustomEnums.cs @@ -70,6 +70,8 @@ namespace Steamworks SteamShutdown = 704, CheckFileSignature = 705, GamepadTextInputDismissed = 714, + AppResumingFromSuspend = 736, + ModalGamepadTextInputDismissed = 738, DlcInstalled = 1005, RegisterActivationCodeResponse = 1008, NewUrlLaunchParameters = 1014, @@ -98,10 +100,6 @@ namespace Steamworks SteamNetworkingMessagesSessionRequest = 1251, SteamNetworkingMessagesSessionFailed = 1252, SteamRelayNetworkStatus = 1281, - RemoteStorageAppSyncedClient = 1301, - RemoteStorageAppSyncedServer = 1302, - RemoteStorageAppSyncProgress = 1303, - RemoteStorageAppSyncStatusCheck = 1305, RemoteStorageFileShareResult = 1307, RemoteStoragePublishFileResult = 1309, RemoteStorageDeletePublishedFileResult = 1311, @@ -126,6 +124,7 @@ namespace Steamworks RemoteStoragePublishedFileUpdated = 1330, RemoteStorageFileWriteAsyncComplete = 1331, RemoteStorageFileReadAsyncComplete = 1332, + RemoteStorageLocalFileChange = 1333, GSStatsReceived = 1800, GSStatsStored = 1801, HTTPRequestCompleted = 2101, @@ -133,6 +132,9 @@ namespace Steamworks HTTPRequestDataReceived = 2103, ScreenshotReady = 2301, ScreenshotRequested = 2302, + SteamInputDeviceConnected = 2801, + SteamInputDeviceDisconnected = 2802, + SteamInputConfigurationLoaded = 2803, SteamUGCQueryCompleted = 3401, SteamUGCRequestUGCDetailsResult = 3402, CreateItemResult = 3403, @@ -150,6 +152,8 @@ namespace Steamworks RemoveAppDependencyResult = 3415, GetAppDependenciesResult = 3416, DeleteItemResult = 3417, + UserSubscribedItemsListChanged = 3418, + WorkshopEULAStatus = 3420, SteamAppInstalled = 3901, SteamAppUninstalled = 3902, PlaybackStatusHasChanged = 4001, @@ -282,6 +286,8 @@ namespace Steamworks { CallbackType.SteamShutdown, typeof( SteamShutdown_t )}, { CallbackType.CheckFileSignature, typeof( CheckFileSignature_t )}, { CallbackType.GamepadTextInputDismissed, typeof( GamepadTextInputDismissed_t )}, + { CallbackType.AppResumingFromSuspend, typeof( AppResumingFromSuspend_t )}, + { CallbackType.ModalGamepadTextInputDismissed, typeof( ModalGamepadTextInputDismissed_t )}, { CallbackType.DlcInstalled, typeof( DlcInstalled_t )}, { CallbackType.RegisterActivationCodeResponse, typeof( RegisterActivationCodeResponse_t )}, { CallbackType.NewUrlLaunchParameters, typeof( NewUrlLaunchParameters_t )}, @@ -308,10 +314,6 @@ namespace Steamworks { CallbackType.SteamNetworkingMessagesSessionRequest, typeof( SteamNetworkingMessagesSessionRequest_t )}, { CallbackType.SteamNetworkingMessagesSessionFailed, typeof( SteamNetworkingMessagesSessionFailed_t )}, { CallbackType.SteamRelayNetworkStatus, typeof( SteamRelayNetworkStatus_t )}, - { CallbackType.RemoteStorageAppSyncedClient, typeof( RemoteStorageAppSyncedClient_t )}, - { CallbackType.RemoteStorageAppSyncedServer, typeof( RemoteStorageAppSyncedServer_t )}, - { CallbackType.RemoteStorageAppSyncProgress, typeof( RemoteStorageAppSyncProgress_t )}, - { CallbackType.RemoteStorageAppSyncStatusCheck, typeof( RemoteStorageAppSyncStatusCheck_t )}, { CallbackType.RemoteStorageFileShareResult, typeof( RemoteStorageFileShareResult_t )}, { CallbackType.RemoteStoragePublishFileResult, typeof( RemoteStoragePublishFileResult_t )}, { CallbackType.RemoteStorageDeletePublishedFileResult, typeof( RemoteStorageDeletePublishedFileResult_t )}, @@ -336,6 +338,7 @@ namespace Steamworks { CallbackType.RemoteStoragePublishedFileUpdated, typeof( RemoteStoragePublishedFileUpdated_t )}, { CallbackType.RemoteStorageFileWriteAsyncComplete, typeof( RemoteStorageFileWriteAsyncComplete_t )}, { CallbackType.RemoteStorageFileReadAsyncComplete, typeof( RemoteStorageFileReadAsyncComplete_t )}, + { CallbackType.RemoteStorageLocalFileChange, typeof( RemoteStorageLocalFileChange_t )}, { CallbackType.GSStatsReceived, typeof( GSStatsReceived_t )}, { CallbackType.GSStatsStored, typeof( GSStatsStored_t )}, { CallbackType.HTTPRequestCompleted, typeof( HTTPRequestCompleted_t )}, @@ -343,6 +346,9 @@ namespace Steamworks { CallbackType.HTTPRequestDataReceived, typeof( HTTPRequestDataReceived_t )}, { CallbackType.ScreenshotReady, typeof( ScreenshotReady_t )}, { CallbackType.ScreenshotRequested, typeof( ScreenshotRequested_t )}, + { CallbackType.SteamInputDeviceConnected, typeof( SteamInputDeviceConnected_t )}, + { CallbackType.SteamInputDeviceDisconnected, typeof( SteamInputDeviceDisconnected_t )}, + { CallbackType.SteamInputConfigurationLoaded, typeof( SteamInputConfigurationLoaded_t )}, { CallbackType.SteamUGCQueryCompleted, typeof( SteamUGCQueryCompleted_t )}, { CallbackType.SteamUGCRequestUGCDetailsResult, typeof( SteamUGCRequestUGCDetailsResult_t )}, { CallbackType.CreateItemResult, typeof( CreateItemResult_t )}, @@ -360,6 +366,8 @@ namespace Steamworks { CallbackType.RemoveAppDependencyResult, typeof( RemoveAppDependencyResult_t )}, { CallbackType.GetAppDependenciesResult, typeof( GetAppDependenciesResult_t )}, { CallbackType.DeleteItemResult, typeof( DeleteItemResult_t )}, + { CallbackType.UserSubscribedItemsListChanged, typeof( UserSubscribedItemsListChanged_t )}, + { CallbackType.WorkshopEULAStatus, typeof( WorkshopEULAStatus_t )}, { CallbackType.SteamAppInstalled, typeof( SteamAppInstalled_t )}, { CallbackType.SteamAppUninstalled, typeof( SteamAppUninstalled_t )}, { CallbackType.PlaybackStatusHasChanged, typeof( PlaybackStatusHasChanged_t )}, diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs index 3918dca..5f13764 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs @@ -18,9 +18,6 @@ namespace Steamworks [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamApps_v008", CallingConvention = Platform.CC)] internal static extern IntPtr SteamAPI_SteamApps_v008(); public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamApps_v008(); - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerApps_v008", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamGameServerApps_v008(); - public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerApps_v008(); #region FunctionMeta diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs index 7e749e5..3d23f31 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs @@ -15,9 +15,9 @@ namespace Steamworks SetupInterface( IsGameServer ); } - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServer_v013", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamGameServer_v013(); - public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServer_v013(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServer_v014", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamGameServer_v014(); + public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServer_v014(); #region FunctionMeta @@ -258,48 +258,13 @@ namespace Steamworks } #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate", CallingConvention = Platform.CC)] - [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _SendUserConnectAndAuthenticate( IntPtr self, uint unIPClient, IntPtr pvAuthBlob, uint cubAuthBlobSize, ref SteamId pSteamIDUser ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_SetAdvertiseServerActive", CallingConvention = Platform.CC)] + private static extern void _SetAdvertiseServerActive( IntPtr self, [MarshalAs( UnmanagedType.U1 )] bool bActive ); #endregion - internal bool SendUserConnectAndAuthenticate( uint unIPClient, IntPtr pvAuthBlob, uint cubAuthBlobSize, ref SteamId pSteamIDUser ) + internal void SetAdvertiseServerActive( [MarshalAs( UnmanagedType.U1 )] bool bActive ) { - var returnValue = _SendUserConnectAndAuthenticate( Self, unIPClient, pvAuthBlob, cubAuthBlobSize, ref pSteamIDUser ); - return returnValue; - } - - #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_CreateUnauthenticatedUserConnection", CallingConvention = Platform.CC)] - private static extern SteamId _CreateUnauthenticatedUserConnection( IntPtr self ); - - #endregion - internal SteamId CreateUnauthenticatedUserConnection() - { - var returnValue = _CreateUnauthenticatedUserConnection( Self ); - return returnValue; - } - - #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_SendUserDisconnect", CallingConvention = Platform.CC)] - private static extern void _SendUserDisconnect( IntPtr self, SteamId steamIDUser ); - - #endregion - internal void SendUserDisconnect( SteamId steamIDUser ) - { - _SendUserDisconnect( Self, steamIDUser ); - } - - #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_BUpdateUserData", CallingConvention = Platform.CC)] - [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _BUpdateUserData( IntPtr self, SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPlayerName, uint uScore ); - - #endregion - internal bool BUpdateUserData( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPlayerName, uint uScore ) - { - var returnValue = _BUpdateUserData( Self, steamIDUser, pchPlayerName, uScore ); - return returnValue; + _SetAdvertiseServerActive( Self, bActive ); } #region FunctionMeta @@ -422,36 +387,6 @@ namespace Steamworks return returnValue; } - #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_EnableHeartbeats", CallingConvention = Platform.CC)] - private static extern void _EnableHeartbeats( IntPtr self, [MarshalAs( UnmanagedType.U1 )] bool bActive ); - - #endregion - internal void EnableHeartbeats( [MarshalAs( UnmanagedType.U1 )] bool bActive ) - { - _EnableHeartbeats( Self, bActive ); - } - - #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_SetHeartbeatInterval", CallingConvention = Platform.CC)] - private static extern void _SetHeartbeatInterval( IntPtr self, int iHeartbeatInterval ); - - #endregion - internal void SetHeartbeatInterval( int iHeartbeatInterval ) - { - _SetHeartbeatInterval( Self, iHeartbeatInterval ); - } - - #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_ForceHeartbeat", CallingConvention = Platform.CC)] - private static extern void _ForceHeartbeat( IntPtr self ); - - #endregion - internal void ForceHeartbeat() - { - _ForceHeartbeat( Self ); - } - #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_AssociateWithClan", CallingConvention = Platform.CC)] private static extern SteamAPICall_t _AssociateWithClan( IntPtr self, SteamId steamIDClan ); @@ -474,5 +409,50 @@ namespace Steamworks return new CallResult( returnValue, IsServer ); } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_SendUserConnectAndAuthenticate_DEPRECATED", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _SendUserConnectAndAuthenticate_DEPRECATED( IntPtr self, uint unIPClient, IntPtr pvAuthBlob, uint cubAuthBlobSize, ref SteamId pSteamIDUser ); + + #endregion + internal bool SendUserConnectAndAuthenticate_DEPRECATED( uint unIPClient, IntPtr pvAuthBlob, uint cubAuthBlobSize, ref SteamId pSteamIDUser ) + { + var returnValue = _SendUserConnectAndAuthenticate_DEPRECATED( Self, unIPClient, pvAuthBlob, cubAuthBlobSize, ref pSteamIDUser ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_CreateUnauthenticatedUserConnection", CallingConvention = Platform.CC)] + private static extern SteamId _CreateUnauthenticatedUserConnection( IntPtr self ); + + #endregion + internal SteamId CreateUnauthenticatedUserConnection() + { + var returnValue = _CreateUnauthenticatedUserConnection( Self ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_SendUserDisconnect_DEPRECATED", CallingConvention = Platform.CC)] + private static extern void _SendUserDisconnect_DEPRECATED( IntPtr self, SteamId steamIDUser ); + + #endregion + internal void SendUserDisconnect_DEPRECATED( SteamId steamIDUser ) + { + _SendUserDisconnect_DEPRECATED( Self, steamIDUser ); + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamGameServer_BUpdateUserData", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _BUpdateUserData( IntPtr self, SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPlayerName, uint uScore ); + + #endregion + internal bool BUpdateUserData( SteamId steamIDUser, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchPlayerName, uint uScore ) + { + var returnValue = _BUpdateUserData( Self, steamIDUser, pchPlayerName, uScore ); + return returnValue; + } + } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs index e2dac0d..5930160 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamInput.cs @@ -15,20 +15,20 @@ namespace Steamworks SetupInterface( IsGameServer ); } - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamInput_v002", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamInput_v002(); - public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamInput_v002(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamInput_v005", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamInput_v005(); + public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamInput_v005(); #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_Init", CallingConvention = Platform.CC)] [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _Init( IntPtr self ); + private static extern bool _Init( IntPtr self, [MarshalAs( UnmanagedType.U1 )] bool bExplicitlyCallRunFrame ); #endregion - internal bool Init() + internal bool Init( [MarshalAs( UnmanagedType.U1 )] bool bExplicitlyCallRunFrame ) { - var returnValue = _Init( Self ); + var returnValue = _Init( Self, bExplicitlyCallRunFrame ); return returnValue; } @@ -45,13 +45,49 @@ namespace Steamworks } #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_RunFrame", CallingConvention = Platform.CC)] - private static extern void _RunFrame( IntPtr self ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_SetInputActionManifestFilePath", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _SetInputActionManifestFilePath( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchInputActionManifestAbsolutePath ); #endregion - internal void RunFrame() + internal bool SetInputActionManifestFilePath( [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchInputActionManifestAbsolutePath ) { - _RunFrame( Self ); + var returnValue = _SetInputActionManifestFilePath( Self, pchInputActionManifestAbsolutePath ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_RunFrame", CallingConvention = Platform.CC)] + private static extern void _RunFrame( IntPtr self, [MarshalAs( UnmanagedType.U1 )] bool bReservedValue ); + + #endregion + internal void RunFrame( [MarshalAs( UnmanagedType.U1 )] bool bReservedValue ) + { + _RunFrame( Self, bReservedValue ); + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_BWaitForData", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _BWaitForData( IntPtr self, [MarshalAs( UnmanagedType.U1 )] bool bWaitForever, uint unTimeout ); + + #endregion + internal bool BWaitForData( [MarshalAs( UnmanagedType.U1 )] bool bWaitForever, uint unTimeout ) + { + var returnValue = _BWaitForData( Self, bWaitForever, unTimeout ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_BNewDataAvailable", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _BNewDataAvailable( IntPtr self ); + + #endregion + internal bool BNewDataAvailable() + { + var returnValue = _BNewDataAvailable( Self ); + return returnValue; } #region FunctionMeta @@ -65,6 +101,16 @@ namespace Steamworks return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_EnableDeviceCallbacks", CallingConvention = Platform.CC)] + private static extern void _EnableDeviceCallbacks( IntPtr self ); + + #endregion + internal void EnableDeviceCallbacks() + { + _EnableDeviceCallbacks( Self ); + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_GetActionSetHandle", CallingConvention = Platform.CC)] private static extern InputActionSetHandle_t _GetActionSetHandle( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszActionSetName ); @@ -171,6 +217,17 @@ namespace Steamworks return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_GetStringForDigitalActionName", CallingConvention = Platform.CC)] + private static extern Utf8StringPointer _GetStringForDigitalActionName( IntPtr self, InputDigitalActionHandle_t eActionHandle ); + + #endregion + internal string GetStringForDigitalActionName( InputDigitalActionHandle_t eActionHandle ) + { + var returnValue = _GetStringForDigitalActionName( Self, eActionHandle ); + return returnValue; + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_GetAnalogActionHandle", CallingConvention = Platform.CC)] private static extern InputAnalogActionHandle_t _GetAnalogActionHandle( IntPtr self, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pszActionName ); @@ -205,13 +262,35 @@ namespace Steamworks } #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_GetGlyphForActionOrigin", CallingConvention = Platform.CC)] - private static extern Utf8StringPointer _GetGlyphForActionOrigin( IntPtr self, InputActionOrigin eOrigin ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_GetGlyphPNGForActionOrigin", CallingConvention = Platform.CC)] + private static extern Utf8StringPointer _GetGlyphPNGForActionOrigin( IntPtr self, InputActionOrigin eOrigin, GlyphSize eSize, uint unFlags ); #endregion - internal string GetGlyphForActionOrigin( InputActionOrigin eOrigin ) + internal string GetGlyphPNGForActionOrigin( InputActionOrigin eOrigin, GlyphSize eSize, uint unFlags ) { - var returnValue = _GetGlyphForActionOrigin( Self, eOrigin ); + var returnValue = _GetGlyphPNGForActionOrigin( Self, eOrigin, eSize, unFlags ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_GetGlyphSVGForActionOrigin", CallingConvention = Platform.CC)] + private static extern Utf8StringPointer _GetGlyphSVGForActionOrigin( IntPtr self, InputActionOrigin eOrigin, uint unFlags ); + + #endregion + internal string GetGlyphSVGForActionOrigin( InputActionOrigin eOrigin, uint unFlags ) + { + var returnValue = _GetGlyphSVGForActionOrigin( Self, eOrigin, unFlags ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_GetGlyphForActionOrigin_Legacy", CallingConvention = Platform.CC)] + private static extern Utf8StringPointer _GetGlyphForActionOrigin_Legacy( IntPtr self, InputActionOrigin eOrigin ); + + #endregion + internal string GetGlyphForActionOrigin_Legacy( InputActionOrigin eOrigin ) + { + var returnValue = _GetGlyphForActionOrigin_Legacy( Self, eOrigin ); return returnValue; } @@ -226,6 +305,17 @@ namespace Steamworks return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_GetStringForAnalogActionName", CallingConvention = Platform.CC)] + private static extern Utf8StringPointer _GetStringForAnalogActionName( IntPtr self, InputAnalogActionHandle_t eActionHandle ); + + #endregion + internal string GetStringForAnalogActionName( InputAnalogActionHandle_t eActionHandle ) + { + var returnValue = _GetStringForAnalogActionName( Self, eActionHandle ); + return returnValue; + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_StopAnalogActionMomentum", CallingConvention = Platform.CC)] private static extern void _StopAnalogActionMomentum( IntPtr self, InputHandle_t inputHandle, InputAnalogActionHandle_t eAction ); @@ -257,6 +347,26 @@ namespace Steamworks _TriggerVibration( Self, inputHandle, usLeftSpeed, usRightSpeed ); } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_TriggerVibrationExtended", CallingConvention = Platform.CC)] + private static extern void _TriggerVibrationExtended( IntPtr self, InputHandle_t inputHandle, ushort usLeftSpeed, ushort usRightSpeed, ushort usLeftTriggerSpeed, ushort usRightTriggerSpeed ); + + #endregion + internal void TriggerVibrationExtended( InputHandle_t inputHandle, ushort usLeftSpeed, ushort usRightSpeed, ushort usLeftTriggerSpeed, ushort usRightTriggerSpeed ) + { + _TriggerVibrationExtended( Self, inputHandle, usLeftSpeed, usRightSpeed, usLeftTriggerSpeed, usRightTriggerSpeed ); + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_TriggerSimpleHapticEvent", CallingConvention = Platform.CC)] + private static extern void _TriggerSimpleHapticEvent( IntPtr self, InputHandle_t inputHandle, ControllerHapticLocation eHapticLocation, byte nIntensity, char nGainDB, byte nOtherIntensity, char nOtherGainDB ); + + #endregion + internal void TriggerSimpleHapticEvent( InputHandle_t inputHandle, ControllerHapticLocation eHapticLocation, byte nIntensity, char nGainDB, byte nOtherIntensity, char nOtherGainDB ) + { + _TriggerSimpleHapticEvent( Self, inputHandle, eHapticLocation, nIntensity, nGainDB, nOtherIntensity, nOtherGainDB ); + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_SetLEDColor", CallingConvention = Platform.CC)] private static extern void _SetLEDColor( IntPtr self, InputHandle_t inputHandle, byte nColorR, byte nColorG, byte nColorB, uint nFlags ); @@ -268,23 +378,23 @@ namespace Steamworks } #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_TriggerHapticPulse", CallingConvention = Platform.CC)] - private static extern void _TriggerHapticPulse( IntPtr self, InputHandle_t inputHandle, SteamControllerPad eTargetPad, ushort usDurationMicroSec ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_Legacy_TriggerHapticPulse", CallingConvention = Platform.CC)] + private static extern void _Legacy_TriggerHapticPulse( IntPtr self, InputHandle_t inputHandle, SteamControllerPad eTargetPad, ushort usDurationMicroSec ); #endregion - internal void TriggerHapticPulse( InputHandle_t inputHandle, SteamControllerPad eTargetPad, ushort usDurationMicroSec ) + internal void Legacy_TriggerHapticPulse( InputHandle_t inputHandle, SteamControllerPad eTargetPad, ushort usDurationMicroSec ) { - _TriggerHapticPulse( Self, inputHandle, eTargetPad, usDurationMicroSec ); + _Legacy_TriggerHapticPulse( Self, inputHandle, eTargetPad, usDurationMicroSec ); } #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_TriggerRepeatedHapticPulse", CallingConvention = Platform.CC)] - private static extern void _TriggerRepeatedHapticPulse( IntPtr self, InputHandle_t inputHandle, SteamControllerPad eTargetPad, ushort usDurationMicroSec, ushort usOffMicroSec, ushort unRepeat, uint nFlags ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_Legacy_TriggerRepeatedHapticPulse", CallingConvention = Platform.CC)] + private static extern void _Legacy_TriggerRepeatedHapticPulse( IntPtr self, InputHandle_t inputHandle, SteamControllerPad eTargetPad, ushort usDurationMicroSec, ushort usOffMicroSec, ushort unRepeat, uint nFlags ); #endregion - internal void TriggerRepeatedHapticPulse( InputHandle_t inputHandle, SteamControllerPad eTargetPad, ushort usDurationMicroSec, ushort usOffMicroSec, ushort unRepeat, uint nFlags ) + internal void Legacy_TriggerRepeatedHapticPulse( InputHandle_t inputHandle, SteamControllerPad eTargetPad, ushort usDurationMicroSec, ushort usOffMicroSec, ushort unRepeat, uint nFlags ) { - _TriggerRepeatedHapticPulse( Self, inputHandle, eTargetPad, usDurationMicroSec, usOffMicroSec, unRepeat, nFlags ); + _Legacy_TriggerRepeatedHapticPulse( Self, inputHandle, eTargetPad, usDurationMicroSec, usOffMicroSec, unRepeat, nFlags ); } #region FunctionMeta @@ -399,5 +509,16 @@ namespace Steamworks return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamInput_GetSessionInputConfigurationSettings", CallingConvention = Platform.CC)] + private static extern ushort _GetSessionInputConfigurationSettings( IntPtr self ); + + #endregion + internal ushort GetSessionInputConfigurationSettings() + { + var returnValue = _GetSessionInputConfigurationSettings( Self ); + return returnValue; + } + } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamInventory.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamInventory.cs index 09d7783..c5ea02c 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamInventory.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamInventory.cs @@ -28,9 +28,6 @@ namespace Steamworks private static extern Result _GetResultStatus( IntPtr self, SteamInventoryResult_t resultHandle ); #endregion - /// - /// Find out the status of an asynchronous inventory result handle. - /// internal Result GetResultStatus( SteamInventoryResult_t resultHandle ) { var returnValue = _GetResultStatus( Self, resultHandle ); @@ -43,9 +40,6 @@ namespace Steamworks private static extern bool _GetResultItems( IntPtr self, SteamInventoryResult_t resultHandle, [In,Out] SteamItemDetails_t[] pOutItemsArray, ref uint punOutItemsArraySize ); #endregion - /// - /// Copies the contents of a result set into a flat array. The specific contents of the result set depend on which query which was used. - /// internal bool GetResultItems( SteamInventoryResult_t resultHandle, [In,Out] SteamItemDetails_t[] pOutItemsArray, ref uint punOutItemsArraySize ) { var returnValue = _GetResultItems( Self, resultHandle, pOutItemsArray, ref punOutItemsArraySize ); @@ -71,9 +65,6 @@ namespace Steamworks private static extern uint _GetResultTimestamp( IntPtr self, SteamInventoryResult_t resultHandle ); #endregion - /// - /// Returns the server time at which the result was generated. Compare against the value of IClientUtils::GetServerRealTime() to determine age. - /// internal uint GetResultTimestamp( SteamInventoryResult_t resultHandle ) { var returnValue = _GetResultTimestamp( Self, resultHandle ); @@ -86,9 +77,6 @@ namespace Steamworks private static extern bool _CheckResultSteamID( IntPtr self, SteamInventoryResult_t resultHandle, SteamId steamIDExpected ); #endregion - /// - /// Returns true if the result belongs to the target steam ID or false if the result does not. This is important when using DeserializeResult to verify that a remote player is not pretending to have a different users inventory. - /// internal bool CheckResultSteamID( SteamInventoryResult_t resultHandle, SteamId steamIDExpected ) { var returnValue = _CheckResultSteamID( Self, resultHandle, steamIDExpected ); @@ -100,9 +88,6 @@ namespace Steamworks private static extern void _DestroyResult( IntPtr self, SteamInventoryResult_t resultHandle ); #endregion - /// - /// Destroys a result handle and frees all associated memory. - /// internal void DestroyResult( SteamInventoryResult_t resultHandle ) { _DestroyResult( Self, resultHandle ); @@ -114,9 +99,6 @@ namespace Steamworks private static extern bool _GetAllItems( IntPtr self, ref SteamInventoryResult_t pResultHandle ); #endregion - /// - /// Captures the entire state of the current users Steam inventory. - /// internal bool GetAllItems( ref SteamInventoryResult_t pResultHandle ) { var returnValue = _GetAllItems( Self, ref pResultHandle ); @@ -129,9 +111,6 @@ namespace Steamworks private static extern bool _GetItemsByID( IntPtr self, ref SteamInventoryResult_t pResultHandle, ref InventoryItemId pInstanceIDs, uint unCountInstanceIDs ); #endregion - /// - /// Captures the state of a subset of the current users Steam inventory identified by an array of item instance IDs. - /// internal bool GetItemsByID( ref SteamInventoryResult_t pResultHandle, ref InventoryItemId pInstanceIDs, uint unCountInstanceIDs ) { var returnValue = _GetItemsByID( Self, ref pResultHandle, ref pInstanceIDs, unCountInstanceIDs ); @@ -180,9 +159,6 @@ namespace Steamworks private static extern bool _GrantPromoItems( IntPtr self, ref SteamInventoryResult_t pResultHandle ); #endregion - /// - /// GrantPromoItems() checks the list of promotional items for which the user may be eligible and grants the items (one time only). - /// internal bool GrantPromoItems( ref SteamInventoryResult_t pResultHandle ) { var returnValue = _GrantPromoItems( Self, ref pResultHandle ); @@ -219,9 +195,6 @@ namespace Steamworks private static extern bool _ConsumeItem( IntPtr self, ref SteamInventoryResult_t pResultHandle, InventoryItemId itemConsume, uint unQuantity ); #endregion - /// - /// ConsumeItem() removes items from the inventory permanently. - /// internal bool ConsumeItem( ref SteamInventoryResult_t pResultHandle, InventoryItemId itemConsume, uint unQuantity ) { var returnValue = _ConsumeItem( Self, ref pResultHandle, itemConsume, unQuantity ); @@ -257,9 +230,6 @@ namespace Steamworks private static extern void _SendItemDropHeartbeat( IntPtr self ); #endregion - /// - /// Deprecated method. Playtime accounting is performed on the Steam servers. - /// internal void SendItemDropHeartbeat() { _SendItemDropHeartbeat( Self ); @@ -271,9 +241,6 @@ namespace Steamworks private static extern bool _TriggerItemDrop( IntPtr self, ref SteamInventoryResult_t pResultHandle, InventoryDefId dropListDefinition ); #endregion - /// - /// Playtime credit must be consumed and turned into item drops by your game. - /// internal bool TriggerItemDrop( ref SteamInventoryResult_t pResultHandle, InventoryDefId dropListDefinition ) { var returnValue = _TriggerItemDrop( Self, ref pResultHandle, dropListDefinition ); @@ -298,9 +265,6 @@ namespace Steamworks private static extern bool _LoadItemDefinitions( IntPtr self ); #endregion - /// - /// LoadItemDefinitions triggers the automatic load and refresh of item definitions. - /// internal bool LoadItemDefinitions() { var returnValue = _LoadItemDefinitions( Self ); @@ -502,9 +466,6 @@ namespace Steamworks private static extern bool _InspectItem( IntPtr self, ref SteamInventoryResult_t pResultHandle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchItemToken ); #endregion - /// - /// Look up the given token and return a pseudo-Inventory item. - /// internal bool InspectItem( ref SteamInventoryResult_t pResultHandle, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pchItemToken ) { var returnValue = _InspectItem( Self, ref pResultHandle, pchItemToken ); diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs index e359320..b3a54d9 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingSockets.cs @@ -15,12 +15,12 @@ namespace Steamworks SetupInterface( IsGameServer ); } - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingSockets_SteamAPI_v009", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamNetworkingSockets_SteamAPI_v009(); - public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamNetworkingSockets_SteamAPI_v009(); - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v009", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v009(); - public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v009(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingSockets_SteamAPI_v011", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamNetworkingSockets_SteamAPI_v011(); + public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamNetworkingSockets_SteamAPI_v011(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v011", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v011(); + public override IntPtr GetServerInterfacePointer() => SteamAPI_SteamGameServerNetworkingSockets_SteamAPI_v011(); #region FunctionMeta @@ -469,6 +469,16 @@ namespace Steamworks return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_ResetIdentity", CallingConvention = Platform.CC)] + private static extern void _ResetIdentity( IntPtr self, ref NetIdentity pIdentity ); + + #endregion + internal void ResetIdentity( ref NetIdentity pIdentity ) + { + _ResetIdentity( Self, ref pIdentity ); + } + #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingSockets_RunCallbacks", CallingConvention = Platform.CC)] private static extern void _RunCallbacks( IntPtr self ); diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs index acdf50c..8bffae4 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamNetworkingUtils.cs @@ -15,9 +15,9 @@ namespace Steamworks SetupInterface( IsGameServer ); } - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingUtils_SteamAPI_v003", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamNetworkingUtils_SteamAPI_v003(); - public override IntPtr GetGlobalInterfacePointer() => SteamAPI_SteamNetworkingUtils_SteamAPI_v003(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingUtils_SteamAPI_v004", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamNetworkingUtils_SteamAPI_v004(); + public override IntPtr GetGlobalInterfacePointer() => SteamAPI_SteamNetworkingUtils_SteamAPI_v004(); #region FunctionMeta @@ -367,24 +367,23 @@ namespace Steamworks #region FunctionMeta [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_GetConfigValueInfo", CallingConvention = Platform.CC)] - [return: MarshalAs( UnmanagedType.I1 )] - private static extern bool _GetConfigValueInfo( IntPtr self, NetConfig eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pOutName, ref NetConfigType pOutDataType, [In,Out] NetConfigScope[] pOutScope, [In,Out] NetConfig[] pOutNextValue ); + private static extern Utf8StringPointer _GetConfigValueInfo( IntPtr self, NetConfig eValue, ref NetConfigType pOutDataType, [In,Out] NetConfigScope[] pOutScope ); #endregion - internal bool GetConfigValueInfo( NetConfig eValue, [MarshalAs( UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof( Utf8StringToNative ) )] string pOutName, ref NetConfigType pOutDataType, [In,Out] NetConfigScope[] pOutScope, [In,Out] NetConfig[] pOutNextValue ) + internal string GetConfigValueInfo( NetConfig eValue, ref NetConfigType pOutDataType, [In,Out] NetConfigScope[] pOutScope ) { - var returnValue = _GetConfigValueInfo( Self, eValue, pOutName, ref pOutDataType, pOutScope, pOutNextValue ); + var returnValue = _GetConfigValueInfo( Self, eValue, ref pOutDataType, pOutScope ); return returnValue; } #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_GetFirstConfigValue", CallingConvention = Platform.CC)] - private static extern NetConfig _GetFirstConfigValue( IntPtr self ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamNetworkingUtils_IterateGenericEditableConfigValues", CallingConvention = Platform.CC)] + private static extern NetConfig _IterateGenericEditableConfigValues( IntPtr self, NetConfig eCurrent, [MarshalAs( UnmanagedType.U1 )] bool bEnumerateDevVars ); #endregion - internal NetConfig GetFirstConfigValue() + internal NetConfig IterateGenericEditableConfigValues( NetConfig eCurrent, [MarshalAs( UnmanagedType.U1 )] bool bEnumerateDevVars ) { - var returnValue = _GetFirstConfigValue( Self ); + var returnValue = _IterateGenericEditableConfigValues( Self, eCurrent, bEnumerateDevVars ); return returnValue; } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamRemoteStorage.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamRemoteStorage.cs index 7d3f5b9..c1a8721 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamRemoteStorage.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamRemoteStorage.cs @@ -15,9 +15,9 @@ namespace Steamworks SetupInterface( IsGameServer ); } - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamRemoteStorage_v014", CallingConvention = Platform.CC)] - internal static extern IntPtr SteamAPI_SteamRemoteStorage_v014(); - public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamRemoteStorage_v014(); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamRemoteStorage_v016", CallingConvention = Platform.CC)] + internal static extern IntPtr SteamAPI_SteamRemoteStorage_v016(); + public override IntPtr GetUserInterfacePointer() => SteamAPI_SteamRemoteStorage_v016(); #region FunctionMeta @@ -375,5 +375,51 @@ namespace Steamworks return new CallResult( returnValue, IsServer ); } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamRemoteStorage_GetLocalFileChangeCount", CallingConvention = Platform.CC)] + private static extern int _GetLocalFileChangeCount( IntPtr self ); + + #endregion + internal int GetLocalFileChangeCount() + { + var returnValue = _GetLocalFileChangeCount( Self ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamRemoteStorage_GetLocalFileChange", CallingConvention = Platform.CC)] + private static extern Utf8StringPointer _GetLocalFileChange( IntPtr self, int iFile, ref RemoteStorageLocalFileChange pEChangeType, ref RemoteStorageFilePathType pEFilePathType ); + + #endregion + internal string GetLocalFileChange( int iFile, ref RemoteStorageLocalFileChange pEChangeType, ref RemoteStorageFilePathType pEFilePathType ) + { + var returnValue = _GetLocalFileChange( Self, iFile, ref pEChangeType, ref pEFilePathType ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamRemoteStorage_BeginFileWriteBatch", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _BeginFileWriteBatch( IntPtr self ); + + #endregion + internal bool BeginFileWriteBatch() + { + var returnValue = _BeginFileWriteBatch( Self ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamRemoteStorage_EndFileWriteBatch", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _EndFileWriteBatch( IntPtr self ); + + #endregion + internal bool EndFileWriteBatch() + { + var returnValue = _EndFileWriteBatch( Self ); + return returnValue; + } + } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs index b79dad5..fa8c4f9 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs @@ -983,5 +983,28 @@ namespace Steamworks return new CallResult( returnValue, IsServer ); } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUGC_ShowWorkshopEULA", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _ShowWorkshopEULA( IntPtr self ); + + #endregion + internal bool ShowWorkshopEULA() + { + var returnValue = _ShowWorkshopEULA( Self ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUGC_GetWorkshopEULAStatus", CallingConvention = Platform.CC)] + private static extern SteamAPICall_t _GetWorkshopEULAStatus( IntPtr self ); + + #endregion + internal CallResult GetWorkshopEULAStatus() + { + var returnValue = _GetWorkshopEULAStatus( Self ); + return new CallResult( returnValue, IsServer ); + } + } } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs index 7b4852b..9a54dab 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs @@ -55,24 +55,24 @@ namespace Steamworks } #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUser_InitiateGameConnection", CallingConvention = Platform.CC)] - private static extern int _InitiateGameConnection( IntPtr self, IntPtr pAuthBlob, int cbMaxAuthBlob, SteamId steamIDGameServer, uint unIPServer, ushort usPortServer, [MarshalAs( UnmanagedType.U1 )] bool bSecure ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUser_InitiateGameConnection_DEPRECATED", CallingConvention = Platform.CC)] + private static extern int _InitiateGameConnection_DEPRECATED( IntPtr self, IntPtr pAuthBlob, int cbMaxAuthBlob, SteamId steamIDGameServer, uint unIPServer, ushort usPortServer, [MarshalAs( UnmanagedType.U1 )] bool bSecure ); #endregion - internal int InitiateGameConnection( IntPtr pAuthBlob, int cbMaxAuthBlob, SteamId steamIDGameServer, uint unIPServer, ushort usPortServer, [MarshalAs( UnmanagedType.U1 )] bool bSecure ) + internal int InitiateGameConnection_DEPRECATED( IntPtr pAuthBlob, int cbMaxAuthBlob, SteamId steamIDGameServer, uint unIPServer, ushort usPortServer, [MarshalAs( UnmanagedType.U1 )] bool bSecure ) { - var returnValue = _InitiateGameConnection( Self, pAuthBlob, cbMaxAuthBlob, steamIDGameServer, unIPServer, usPortServer, bSecure ); + var returnValue = _InitiateGameConnection_DEPRECATED( Self, pAuthBlob, cbMaxAuthBlob, steamIDGameServer, unIPServer, usPortServer, bSecure ); return returnValue; } #region FunctionMeta - [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUser_TerminateGameConnection", CallingConvention = Platform.CC)] - private static extern void _TerminateGameConnection( IntPtr self, uint unIPServer, ushort usPortServer ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUser_TerminateGameConnection_DEPRECATED", CallingConvention = Platform.CC)] + private static extern void _TerminateGameConnection_DEPRECATED( IntPtr self, uint unIPServer, ushort usPortServer ); #endregion - internal void TerminateGameConnection( uint unIPServer, ushort usPortServer ) + internal void TerminateGameConnection_DEPRECATED( uint unIPServer, ushort usPortServer ) { - _TerminateGameConnection( Self, unIPServer, usPortServer ); + _TerminateGameConnection_DEPRECATED( Self, unIPServer, usPortServer ); } #region FunctionMeta diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUserStats.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUserStats.cs index 5ec2053..ab98ca6 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUserStats.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUserStats.cs @@ -361,9 +361,6 @@ namespace Steamworks private static extern SteamAPICall_t _DownloadLeaderboardEntriesForUsers( IntPtr self, SteamLeaderboard_t hSteamLeaderboard, [In,Out] SteamId[] prgUsers, int cUsers ); #endregion - /// - /// Downloads leaderboard entries for an arbitrary set of users - ELeaderboardDataRequest is k_ELeaderboardDataRequestUsers - /// internal CallResult DownloadLeaderboardEntriesForUsers( SteamLeaderboard_t hSteamLeaderboard, [In,Out] SteamId[] prgUsers, int cUsers ) { var returnValue = _DownloadLeaderboardEntriesForUsers( Self, hSteamLeaderboard, prgUsers, cUsers ); diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs index ce4d1b5..22ffada 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUtils.cs @@ -387,5 +387,39 @@ namespace Steamworks return returnValue; } + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUtils_IsSteamRunningOnSteamDeck", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _IsSteamRunningOnSteamDeck( IntPtr self ); + + #endregion + internal bool IsSteamRunningOnSteamDeck() + { + var returnValue = _IsSteamRunningOnSteamDeck( Self ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUtils_ShowModalGamepadTextInput", CallingConvention = Platform.CC)] + [return: MarshalAs( UnmanagedType.I1 )] + private static extern bool _ShowModalGamepadTextInput( IntPtr self, GamepadTextInputLineMode eLineInputMode ); + + #endregion + internal bool ShowModalGamepadTextInput( GamepadTextInputLineMode eLineInputMode ) + { + var returnValue = _ShowModalGamepadTextInput( Self, eLineInputMode ); + return returnValue; + } + + #region FunctionMeta + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_ISteamUtils_SetGameLauncherMode", CallingConvention = Platform.CC)] + private static extern void _SetGameLauncherMode( IntPtr self, [MarshalAs( UnmanagedType.U1 )] bool bLauncherMode ); + + #endregion + internal void SetGameLauncherMode( [MarshalAs( UnmanagedType.U1 )] bool bLauncherMode ) + { + _SetGameLauncherMode( Self, bLauncherMode ); + } + } } diff --git a/Facepunch.Steamworks/Generated/SteamCallbacks.cs b/Facepunch.Steamworks/Generated/SteamCallbacks.cs index 2275a42..a3f9eae 100644 --- a/Facepunch.Steamworks/Generated/SteamCallbacks.cs +++ b/Facepunch.Steamworks/Generated/SteamCallbacks.cs @@ -561,6 +561,28 @@ namespace Steamworks.Data #endregion } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + internal struct AppResumingFromSuspend_t : ICallbackData + { + + #region SteamCallback + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(AppResumingFromSuspend_t) ); + public int DataSize => _datasize; + public CallbackType CallbackType => CallbackType.AppResumingFromSuspend; + #endregion + } + + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + internal struct ModalGamepadTextInputDismissed_t : ICallbackData + { + + #region SteamCallback + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(ModalGamepadTextInputDismissed_t) ); + public int DataSize => _datasize; + public CallbackType CallbackType => CallbackType.ModalGamepadTextInputDismissed; + #endregion + } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] internal struct FavoritesListChanged_t : ICallbackData { @@ -928,66 +950,6 @@ namespace Steamworks.Data #endregion } - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] - internal struct RemoteStorageAppSyncedClient_t : ICallbackData - { - internal AppId AppID; // m_nAppID AppId_t - internal Result Result; // m_eResult EResult - internal int NumDownloads; // m_unNumDownloads int - - #region SteamCallback - public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(RemoteStorageAppSyncedClient_t) ); - public int DataSize => _datasize; - public CallbackType CallbackType => CallbackType.RemoteStorageAppSyncedClient; - #endregion - } - - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] - internal struct RemoteStorageAppSyncedServer_t : ICallbackData - { - internal AppId AppID; // m_nAppID AppId_t - internal Result Result; // m_eResult EResult - internal int NumUploads; // m_unNumUploads int - - #region SteamCallback - public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(RemoteStorageAppSyncedServer_t) ); - public int DataSize => _datasize; - public CallbackType CallbackType => CallbackType.RemoteStorageAppSyncedServer; - #endregion - } - - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] - internal struct RemoteStorageAppSyncProgress_t : ICallbackData - { - internal string CurrentFileUTF8() => System.Text.Encoding.UTF8.GetString( CurrentFile, 0, System.Array.IndexOf( CurrentFile, 0 ) ); - [MarshalAs(UnmanagedType.ByValArray, SizeConst = 260)] // byte[] m_rgchCurrentFile - internal byte[] CurrentFile; // m_rgchCurrentFile char [260] - internal AppId AppID; // m_nAppID AppId_t - internal uint BytesTransferredThisChunk; // m_uBytesTransferredThisChunk uint32 - internal double DAppPercentComplete; // m_dAppPercentComplete double - [MarshalAs(UnmanagedType.I1)] - internal bool Uploading; // m_bUploading bool - - #region SteamCallback - public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(RemoteStorageAppSyncProgress_t) ); - public int DataSize => _datasize; - public CallbackType CallbackType => CallbackType.RemoteStorageAppSyncProgress; - #endregion - } - - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] - internal struct RemoteStorageAppSyncStatusCheck_t : ICallbackData - { - internal AppId AppID; // m_nAppID AppId_t - internal Result Result; // m_eResult EResult - - #region SteamCallback - public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(RemoteStorageAppSyncStatusCheck_t) ); - public int DataSize => _datasize; - public CallbackType CallbackType => CallbackType.RemoteStorageAppSyncStatusCheck; - #endregion - } - [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] internal struct RemoteStorageFileShareResult_t : ICallbackData { @@ -1378,6 +1340,17 @@ namespace Steamworks.Data #endregion } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + internal struct RemoteStorageLocalFileChange_t : ICallbackData + { + + #region SteamCallback + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(RemoteStorageLocalFileChange_t) ); + public int DataSize => _datasize; + public CallbackType CallbackType => CallbackType.RemoteStorageLocalFileChange; + #endregion + } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPackSize )] internal struct UserStatsReceived_t : ICallbackData { @@ -1914,6 +1887,50 @@ namespace Steamworks.Data #endregion } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + internal struct SteamInputDeviceConnected_t : ICallbackData + { + internal ulong ConnectedDeviceHandle; // m_ulConnectedDeviceHandle InputHandle_t + + #region SteamCallback + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(SteamInputDeviceConnected_t) ); + public int DataSize => _datasize; + public CallbackType CallbackType => CallbackType.SteamInputDeviceConnected; + #endregion + } + + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + internal struct SteamInputDeviceDisconnected_t : ICallbackData + { + internal ulong DisconnectedDeviceHandle; // m_ulDisconnectedDeviceHandle InputHandle_t + + #region SteamCallback + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(SteamInputDeviceDisconnected_t) ); + public int DataSize => _datasize; + public CallbackType CallbackType => CallbackType.SteamInputDeviceDisconnected; + #endregion + } + + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPackSize )] + internal struct SteamInputConfigurationLoaded_t : ICallbackData + { + internal AppId AppID; // m_unAppID AppId_t + internal ulong DeviceHandle; // m_ulDeviceHandle InputHandle_t + internal ulong MappingCreator; // m_ulMappingCreator CSteamID + internal uint MajorRevision; // m_unMajorRevision uint32 + internal uint MinorRevision; // m_unMinorRevision uint32 + [MarshalAs(UnmanagedType.I1)] + internal bool UsesSteamInputAPI; // m_bUsesSteamInputAPI bool + [MarshalAs(UnmanagedType.I1)] + internal bool UsesGamepadAPI; // m_bUsesGamepadAPI bool + + #region SteamCallback + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(SteamInputConfigurationLoaded_t) ); + public int DataSize => _datasize; + public CallbackType CallbackType => CallbackType.SteamInputConfigurationLoaded; + #endregion + } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] internal struct SteamUGCQueryCompleted_t : ICallbackData { @@ -2164,10 +2181,42 @@ namespace Steamworks.Data #endregion } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + internal struct UserSubscribedItemsListChanged_t : ICallbackData + { + internal AppId AppID; // m_nAppID AppId_t + + #region SteamCallback + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(UserSubscribedItemsListChanged_t) ); + public int DataSize => _datasize; + public CallbackType CallbackType => CallbackType.UserSubscribedItemsListChanged; + #endregion + } + + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + internal struct WorkshopEULAStatus_t : ICallbackData + { + internal Result Result; // m_eResult EResult + internal AppId AppID; // m_nAppID AppId_t + internal uint Version; // m_unVersion uint32 + internal uint TAction; // m_rtAction RTime32 + [MarshalAs(UnmanagedType.I1)] + internal bool Accepted; // m_bAccepted bool + [MarshalAs(UnmanagedType.I1)] + internal bool NeedsAction; // m_bNeedsAction bool + + #region SteamCallback + public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(WorkshopEULAStatus_t) ); + public int DataSize => _datasize; + public CallbackType CallbackType => CallbackType.WorkshopEULAStatus; + #endregion + } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] internal struct SteamAppInstalled_t : ICallbackData { internal AppId AppID; // m_nAppID AppId_t + internal int InstallFolderIndex; // m_iInstallFolderIndex int #region SteamCallback public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(SteamAppInstalled_t) ); @@ -2180,6 +2229,7 @@ namespace Steamworks.Data internal struct SteamAppUninstalled_t : ICallbackData { internal AppId AppID; // m_nAppID AppId_t + internal int InstallFolderIndex; // m_iInstallFolderIndex int #region SteamCallback public static int _datasize = System.Runtime.InteropServices.Marshal.SizeOf( typeof(SteamAppUninstalled_t) ); diff --git a/Facepunch.Steamworks/Generated/SteamConstants.cs b/Facepunch.Steamworks/Generated/SteamConstants.cs index 62c7a2d..e80c98b 100644 --- a/Facepunch.Steamworks/Generated/SteamConstants.cs +++ b/Facepunch.Steamworks/Generated/SteamConstants.cs @@ -8,22 +8,9 @@ namespace Steamworks.Data { internal static class Defines { - internal static readonly int k_cubSaltSize = 8; - internal static readonly GID_t k_GIDNil = 0xffffffffffffffff; - internal static readonly GID_t k_TxnIDNil = k_GIDNil; - internal static readonly GID_t k_TxnIDUnknown = 0; - internal static readonly JobID_t k_JobIDNil = 0xffffffffffffffff; - internal static readonly PackageId_t k_uPackageIdInvalid = 0xFFFFFFFF; - internal static readonly BundleId_t k_uBundleIdInvalid = 0; internal static readonly AppId k_uAppIdInvalid = 0x0; - internal static readonly AssetClassId_t k_ulAssetClassIdInvalid = 0x0; - internal static readonly PhysicalItemId_t k_uPhysicalItemIdInvalid = 0x0; internal static readonly DepotId_t k_uDepotIdInvalid = 0x0; - internal static readonly CellID_t k_uCellIDInvalid = 0xFFFFFFFF; internal static readonly SteamAPICall_t k_uAPICallInvalid = 0x0; - internal static readonly PartnerId_t k_uPartnerIdInvalid = 0; - internal static readonly ManifestId_t k_uManifestIdInvalid = 0; - internal static readonly SiteId_t k_ulSiteIdInvalid = 0; internal static readonly PartyBeaconID_t k_ulPartyBeaconIdInvalid = 0; internal static readonly HAuthTicket k_HAuthTicketInvalid = 0; internal static readonly uint k_unSteamAccountIDMask = 0xFFFFFFFF; @@ -77,6 +64,12 @@ namespace Steamworks.Data internal static readonly int k_cchMaxSteamNetworkingErrMsg = 1024; internal static readonly int k_cchSteamNetworkingMaxConnectionCloseReason = 128; internal static readonly int k_cchSteamNetworkingMaxConnectionDescription = 128; + internal static readonly int k_nSteamNetworkConnectionInfoFlags_Unauthenticated = 1; + internal static readonly int k_nSteamNetworkConnectionInfoFlags_Unencrypted = 2; + internal static readonly int k_nSteamNetworkConnectionInfoFlags_LoopbackBuffers = 4; + internal static readonly int k_nSteamNetworkConnectionInfoFlags_Fast = 8; + internal static readonly int k_nSteamNetworkConnectionInfoFlags_Relayed = 16; + internal static readonly int k_nSteamNetworkConnectionInfoFlags_DualWifi = 32; internal static readonly int k_cbMaxSteamNetworkingSocketsMessageSizeSend = 512 * 1024; internal static readonly int k_nSteamNetworkingSend_Unreliable = 0; internal static readonly int k_nSteamNetworkingSend_NoNagle = 1; @@ -97,6 +90,8 @@ namespace Steamworks.Data internal static readonly int k_nSteamNetworkingConfig_P2P_Transport_ICE_Enable_Public = 4; internal static readonly int k_nSteamNetworkingConfig_P2P_Transport_ICE_Enable_All = 0x7fffffff; internal static readonly SteamNetworkingPOPID k_SteamDatagramPOPID_dev = ( ( uint ) 'd' << 16 ) | ( ( uint ) 'e' << 8 ) | ( uint ) 'v'; + internal static readonly ushort STEAMGAMESERVER_QUERY_PORT_SHARED = 0xffff; + internal static readonly ushort MASTERSERVERUPDATERPORT_USEGAMESOCKETSHARE = STEAMGAMESERVER_QUERY_PORT_SHARED; internal static readonly uint k_cbSteamDatagramMaxSerializedTicket = 512; internal static readonly uint k_cbMaxSteamDatagramGameCoordinatorServerLoginAppData = 2048; internal static readonly uint k_cbMaxSteamDatagramGameCoordinatorServerLoginSerialized = 4096; diff --git a/Facepunch.Steamworks/Generated/SteamEnums.cs b/Facepunch.Steamworks/Generated/SteamEnums.cs index f87174e..992a275 100644 --- a/Facepunch.Steamworks/Generated/SteamEnums.cs +++ b/Facepunch.Steamworks/Generated/SteamEnums.cs @@ -152,6 +152,9 @@ namespace Steamworks NoLauncherSpecified = 117, MustAgreeToSSA = 118, LauncherMigrated = 119, + SteamRealmMismatch = 120, + InvalidSignature = 121, + ParseFailure = 122, } // @@ -253,89 +256,6 @@ namespace Steamworks Max = 11, } - // - // EAppReleaseState - // - internal enum AppReleaseState : int - { - Unknown = 0, - Unavailable = 1, - Prerelease = 2, - PreloadOnly = 3, - Released = 4, - } - - // - // EAppOwnershipFlags - // - internal enum AppOwnershipFlags : int - { - None = 0, - OwnsLicense = 1, - FreeLicense = 2, - RegionRestricted = 4, - LowViolence = 8, - InvalidPlatform = 16, - SharedLicense = 32, - FreeWeekend = 64, - RetailLicense = 128, - LicenseLocked = 256, - LicensePending = 512, - LicenseExpired = 1024, - LicensePermanent = 2048, - LicenseRecurring = 4096, - LicenseCanceled = 8192, - AutoGrant = 16384, - PendingGift = 32768, - RentalNotActivated = 65536, - Rental = 131072, - SiteLicense = 262144, - LegacyFreeSub = 524288, - InvalidOSType = 1048576, - TimedTrial = 2097152, - } - - // - // EAppType - // - internal enum AppType : int - { - Invalid = 0, - Game = 1, - Application = 2, - Tool = 4, - Demo = 8, - Media_DEPRECATED = 16, - DLC = 32, - Guide = 64, - Driver = 128, - Config = 256, - Hardware = 512, - Franchise = 1024, - Video = 2048, - Plugin = 4096, - MusicAlbum = 8192, - Series = 16384, - Comic_UNUSED = 32768, - Beta = 65536, - Shortcut = 1073741824, - DepotOnly_DEPRECATED = -2147483648, - } - - // - // ESteamUserStatType - // - internal enum SteamUserStatType : int - { - INVALID = 0, - INT = 1, - FLOAT = 2, - AVGRATE = 3, - ACHIEVEMENTS = 4, - GROUPACHIEVEMENTS = 5, - MAX = 6, - } - // // EChatEntryType // @@ -385,19 +305,6 @@ namespace Steamworks InstanceFlagMMSLobby = 131072, } - // - // EMarketingMessageFlags - // - internal enum MarketingMessageFlags : int - { - None = 0, - HighPriority = 1, - PlatformWindows = 2, - PlatformMac = 4, - PlatformLinux = 8, - PlatformRestrictions = 14, - } - // // ENotificationPosition // @@ -440,71 +347,6 @@ namespace Steamworks AudioInitFailed = 23, } - // - // ELaunchOptionType - // - internal enum LaunchOptionType : int - { - None = 0, - Default = 1, - SafeMode = 2, - Multiplayer = 3, - Config = 4, - OpenVR = 5, - Server = 6, - Editor = 7, - Manual = 8, - Benchmark = 9, - Option1 = 10, - Option2 = 11, - Option3 = 12, - OculusVR = 13, - OpenVROverlay = 14, - OSVR = 15, - Dialog = 1000, - } - - // - // EVRHMDType - // - internal enum VRHMDType : int - { - MDType_None = -1, - MDType_Unknown = 0, - MDType_HTC_Dev = 1, - MDType_HTC_VivePre = 2, - MDType_HTC_Vive = 3, - MDType_HTC_VivePro = 4, - MDType_HTC_ViveCosmos = 5, - MDType_HTC_Unknown = 20, - MDType_Oculus_DK1 = 21, - MDType_Oculus_DK2 = 22, - MDType_Oculus_Rift = 23, - MDType_Oculus_RiftS = 24, - MDType_Oculus_Quest = 25, - MDType_Oculus_Unknown = 40, - MDType_Acer_Unknown = 50, - MDType_Acer_WindowsMR = 51, - MDType_Dell_Unknown = 60, - MDType_Dell_Visor = 61, - MDType_Lenovo_Unknown = 70, - MDType_Lenovo_Explorer = 71, - MDType_HP_Unknown = 80, - MDType_HP_WindowsMR = 81, - MDType_HP_Reverb = 82, - MDType_HP_ReverbG2 = 1463, - MDType_Samsung_Unknown = 90, - MDType_Samsung_Odyssey = 91, - MDType_Unannounced_Unknown = 100, - MDType_Unannounced_WindowsMR = 101, - MDType_vridge = 110, - MDType_Huawei_Unknown = 120, - MDType_Huawei_VR2 = 121, - MDType_Huawei_EndOfRange = 129, - mdType_Valve_Unknown = 130, - mdType_Valve_Index = 131, - } - // // EMarketNotAllowedReasonFlags // @@ -961,6 +803,26 @@ namespace Steamworks lose = 2, } + // + // ERemoteStorageLocalFileChange + // + internal enum RemoteStorageLocalFileChange : int + { + Invalid = 0, + FileUpdated = 1, + FileDeleted = 2, + } + + // + // ERemoteStorageFilePathType + // + internal enum RemoteStorageFilePathType : int + { + Invalid = 0, + Absolute = 1, + APIFilename = 2, + } + // // ELeaderboardDataRequest // @@ -1293,11 +1155,11 @@ namespace Steamworks XBoxOne_DPad_West = 140, XBoxOne_DPad_East = 141, XBoxOne_DPad_Move = 142, - XBoxOne_Reserved1 = 143, - XBoxOne_Reserved2 = 144, - XBoxOne_Reserved3 = 145, - XBoxOne_Reserved4 = 146, - XBoxOne_Reserved5 = 147, + XBoxOne_LeftGrip_Lower = 143, + XBoxOne_LeftGrip_Upper = 144, + XBoxOne_RightGrip_Lower = 145, + XBoxOne_RightGrip_Upper = 146, + XBoxOne_Share = 147, XBoxOne_Reserved6 = 148, XBoxOne_Reserved7 = 149, XBoxOne_Reserved8 = 150, @@ -1532,6 +1394,26 @@ namespace Steamworks Right = 1, } + // + // EControllerHapticLocation + // + internal enum ControllerHapticLocation : int + { + Left = 1, + Right = 2, + Both = 3, + } + + // + // EControllerHapticType + // + internal enum ControllerHapticType : int + { + Off = 0, + Tick = 1, + Click = 2, + } + // // ESteamInputType // @@ -1555,6 +1437,18 @@ namespace Steamworks MaximumPossibleValue = 255, } + // + // ESteamInputConfigurationEnableType + // + internal enum SteamInputConfigurationEnableType : int + { + None = 0, + Playstation = 1, + Xbox = 2, + Generic = 4, + Switch = 8, + } + // // ESteamInputLEDFlag // @@ -1564,6 +1458,25 @@ namespace Steamworks RestoreUserDefault = 1, } + // + // ESteamInputGlyphSize + // + public enum GlyphSize : int + { + Small = 0, + Medium = 1, + Large = 2, + } + + // + // ESteamInputActionEventType + // + internal enum SteamInputActionEventType : int + { + DigitalAction = 0, + AnalogAction = 1, + } + // // EControllerActionOrigin // @@ -1869,7 +1782,12 @@ namespace Steamworks PS5_Gyro_Pitch = 297, PS5_Gyro_Yaw = 298, PS5_Gyro_Roll = 299, - Count = 300, + XBoxOne_LeftGrip_Lower = 300, + XBoxOne_LeftGrip_Upper = 301, + XBoxOne_RightGrip_Lower = 302, + XBoxOne_RightGrip_Upper = 303, + XBoxOne_Share = 304, + Count = 305, MaximumPossibleValue = 32767, } @@ -1957,6 +1875,7 @@ namespace Steamworks RankedByLifetimeAveragePlaytime = 16, RankedByPlaytimeSessionsTrend = 17, RankedByLifetimePlaytimeSessions = 18, + RankedByLastUpdatedDate = 19, } // @@ -2137,8 +2056,6 @@ namespace Steamworks Remote_Timeout = 4001, Remote_BadCrypt = 4002, Remote_BadCert = 4003, - Remote_NotLoggedIn = 4004, - Remote_NotRunningApp = 4005, Remote_BadProtocolVersion = 4006, Remote_P2P_ICE_NoPublicAddresses = 4007, Remote_Max = 4999, @@ -2146,7 +2063,6 @@ namespace Steamworks Misc_Generic = 5001, Misc_InternalError = 5002, Misc_Timeout = 5003, - Misc_RelayConnectivity = 5004, Misc_SteamConnectivity = 5005, Misc_NoRelaySessionsToClient = 5006, Misc_P2P_Rendezvous = 5008, @@ -2155,21 +2071,6 @@ namespace Steamworks Misc_Max = 5999, } - // - // ESteamNetTransportKind - // - internal enum SteamNetTransportKind : int - { - Unknown = 0, - LoopbackBuffers = 1, - LocalHost = 2, - UDP = 3, - UDPProbablyLocal = 4, - TURN = 5, - SDRP2P = 6, - SDRHostedServer = 7, - } - // // ESteamNetworkingConfigScope // @@ -2199,6 +2100,20 @@ namespace Steamworks internal enum NetConfig : int { Invalid = 0, + TimeoutInitial = 24, + TimeoutConnected = 25, + SendBufferSize = 9, + ConnectionUserData = 40, + SendRateMin = 10, + SendRateMax = 11, + NagleTime = 12, + IP_AllowWithoutAuth = 23, + MTU_PacketSize = 32, + MTU_DataSize = 33, + Unencrypted = 34, + SymmetricConnect = 37, + LocalVirtualPort = 38, + DualWifi_Enable = 39, FakePacketLoss_Send = 2, FakePacketLoss_Recv = 3, FakePacketLag_Send = 4, @@ -2209,19 +2124,11 @@ namespace Steamworks FakePacketDup_Send = 26, FakePacketDup_Recv = 27, FakePacketDup_TimeMax = 28, - TimeoutInitial = 24, - TimeoutConnected = 25, - SendBufferSize = 9, - SendRateMin = 10, - SendRateMax = 11, - NagleTime = 12, - IP_AllowWithoutAuth = 23, - MTU_PacketSize = 32, - MTU_DataSize = 33, - Unencrypted = 34, - EnumerateDevVars = 35, - SymmetricConnect = 37, - LocalVirtualPort = 38, + PacketTraceMaxBytes = 41, + FakeRateLimit_Send_Rate = 42, + FakeRateLimit_Send_Burst = 43, + FakeRateLimit_Recv_Rate = 44, + FakeRateLimit_Recv_Burst = 45, Callback_ConnectionStatusChanged = 201, Callback_AuthStatusChanged = 202, Callback_RelayNetworkStatusChanged = 203, @@ -2246,6 +2153,7 @@ namespace Steamworks LogLevel_PacketGaps = 16, LogLevel_P2PRendezvous = 17, LogLevel_SDRRelayPings = 18, + DELETED_EnumerateDevVars = 35, } // diff --git a/Facepunch.Steamworks/Generated/SteamStructFunctions.cs b/Facepunch.Steamworks/Generated/SteamStructFunctions.cs index e816d4e..acd40ef 100644 --- a/Facepunch.Steamworks/Generated/SteamStructFunctions.cs +++ b/Facepunch.Steamworks/Generated/SteamStructFunctions.cs @@ -153,6 +153,12 @@ namespace Steamworks.Data [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIdentity_GetIPAddr", CallingConvention = Platform.CC)] internal static extern IntPtr InternalGetIPAddr( ref NetIdentity self ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIdentity_SetIPv4Addr", CallingConvention = Platform.CC)] + internal static extern void InternalSetIPv4Addr( ref NetIdentity self, uint nIPv4, ushort nPort ); + + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIdentity_GetIPv4", CallingConvention = Platform.CC)] + internal static extern uint InternalGetIPv4( ref NetIdentity self ); + [DllImport( Platform.LibraryName, EntryPoint = "SteamAPI_SteamNetworkingIdentity_SetLocalHost", CallingConvention = Platform.CC)] internal static extern void InternalSetLocalHost( ref NetIdentity self ); diff --git a/Facepunch.Steamworks/Generated/SteamStructs.cs b/Facepunch.Steamworks/Generated/SteamStructs.cs index 63d1efb..cbc42b1 100644 --- a/Facepunch.Steamworks/Generated/SteamStructs.cs +++ b/Facepunch.Steamworks/Generated/SteamStructs.cs @@ -105,6 +105,16 @@ namespace Steamworks.Data } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] + internal struct SteamInputActionEvent_t + { + internal ulong ControllerHandle; // controllerHandle InputHandle_t + internal SteamInputActionEventType EEventType; // eEventType ESteamInputActionEventType + internal ulong AnalogAction_actionHandle; // analogAction_actionHandle InputAnalogActionHandle_t + internal AnalogState AnalogAction_analogActionData; // analogAction_analogActionData InputAnalogActionData_t + + } + [StructLayout( LayoutKind.Sequential, Pack = Platform.StructPlatformPackSize )] internal struct SteamUGCDetails_t { diff --git a/Facepunch.Steamworks/Generated/SteamTypes.cs b/Facepunch.Steamworks/Generated/SteamTypes.cs index 44f5be6..5f5085f 100644 --- a/Facepunch.Steamworks/Generated/SteamTypes.cs +++ b/Facepunch.Steamworks/Generated/SteamTypes.cs @@ -6,118 +6,6 @@ using System.Threading.Tasks; namespace Steamworks.Data { - internal struct GID_t : IEquatable, IComparable - { - // Name: GID_t, Type: unsigned long long - public ulong Value; - - public static implicit operator GID_t( ulong value ) => new GID_t(){ Value = value }; - public static implicit operator ulong( GID_t value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (GID_t) p ); - public bool Equals( GID_t p ) => p.Value == Value; - public static bool operator ==( GID_t a, GID_t b ) => a.Equals( b ); - public static bool operator !=( GID_t a, GID_t b ) => !a.Equals( b ); - public int CompareTo( GID_t other ) => Value.CompareTo( other.Value ); - } - - internal struct JobID_t : IEquatable, IComparable - { - // Name: JobID_t, Type: unsigned long long - public ulong Value; - - public static implicit operator JobID_t( ulong value ) => new JobID_t(){ Value = value }; - public static implicit operator ulong( JobID_t value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (JobID_t) p ); - public bool Equals( JobID_t p ) => p.Value == Value; - public static bool operator ==( JobID_t a, JobID_t b ) => a.Equals( b ); - public static bool operator !=( JobID_t a, JobID_t b ) => !a.Equals( b ); - public int CompareTo( JobID_t other ) => Value.CompareTo( other.Value ); - } - - internal struct TxnID_t : IEquatable, IComparable - { - // Name: TxnID_t, Type: unsigned long long - public ulong Value; - - public static implicit operator TxnID_t( ulong value ) => new TxnID_t(){ Value = value }; - public static implicit operator ulong( TxnID_t value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (TxnID_t) p ); - public bool Equals( TxnID_t p ) => p.Value == Value; - public static bool operator ==( TxnID_t a, TxnID_t b ) => a.Equals( b ); - public static bool operator !=( TxnID_t a, TxnID_t b ) => !a.Equals( b ); - public int CompareTo( TxnID_t other ) => Value.CompareTo( other.Value ); - } - - internal struct PackageId_t : IEquatable, IComparable - { - // Name: PackageId_t, Type: unsigned int - public uint Value; - - public static implicit operator PackageId_t( uint value ) => new PackageId_t(){ Value = value }; - public static implicit operator uint( PackageId_t value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (PackageId_t) p ); - public bool Equals( PackageId_t p ) => p.Value == Value; - public static bool operator ==( PackageId_t a, PackageId_t b ) => a.Equals( b ); - public static bool operator !=( PackageId_t a, PackageId_t b ) => !a.Equals( b ); - public int CompareTo( PackageId_t other ) => Value.CompareTo( other.Value ); - } - - internal struct BundleId_t : IEquatable, IComparable - { - // Name: BundleId_t, Type: unsigned int - public uint Value; - - public static implicit operator BundleId_t( uint value ) => new BundleId_t(){ Value = value }; - public static implicit operator uint( BundleId_t value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (BundleId_t) p ); - public bool Equals( BundleId_t p ) => p.Value == Value; - public static bool operator ==( BundleId_t a, BundleId_t b ) => a.Equals( b ); - public static bool operator !=( BundleId_t a, BundleId_t b ) => !a.Equals( b ); - public int CompareTo( BundleId_t other ) => Value.CompareTo( other.Value ); - } - - internal struct AssetClassId_t : IEquatable, IComparable - { - // Name: AssetClassId_t, Type: unsigned long long - public ulong Value; - - public static implicit operator AssetClassId_t( ulong value ) => new AssetClassId_t(){ Value = value }; - public static implicit operator ulong( AssetClassId_t value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (AssetClassId_t) p ); - public bool Equals( AssetClassId_t p ) => p.Value == Value; - public static bool operator ==( AssetClassId_t a, AssetClassId_t b ) => a.Equals( b ); - public static bool operator !=( AssetClassId_t a, AssetClassId_t b ) => !a.Equals( b ); - public int CompareTo( AssetClassId_t other ) => Value.CompareTo( other.Value ); - } - - internal struct PhysicalItemId_t : IEquatable, IComparable - { - // Name: PhysicalItemId_t, Type: unsigned int - public uint Value; - - public static implicit operator PhysicalItemId_t( uint value ) => new PhysicalItemId_t(){ Value = value }; - public static implicit operator uint( PhysicalItemId_t value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (PhysicalItemId_t) p ); - public bool Equals( PhysicalItemId_t p ) => p.Value == Value; - public static bool operator ==( PhysicalItemId_t a, PhysicalItemId_t b ) => a.Equals( b ); - public static bool operator !=( PhysicalItemId_t a, PhysicalItemId_t b ) => !a.Equals( b ); - public int CompareTo( PhysicalItemId_t other ) => Value.CompareTo( other.Value ); - } - internal struct DepotId_t : IEquatable, IComparable { // Name: DepotId_t, Type: unsigned int @@ -150,22 +38,6 @@ namespace Steamworks.Data public int CompareTo( RTime32 other ) => Value.CompareTo( other.Value ); } - internal struct CellID_t : IEquatable, IComparable - { - // Name: CellID_t, Type: unsigned int - public uint Value; - - public static implicit operator CellID_t( uint value ) => new CellID_t(){ Value = value }; - public static implicit operator uint( CellID_t value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (CellID_t) p ); - public bool Equals( CellID_t p ) => p.Value == Value; - public static bool operator ==( CellID_t a, CellID_t b ) => a.Equals( b ); - public static bool operator !=( CellID_t a, CellID_t b ) => !a.Equals( b ); - public int CompareTo( CellID_t other ) => Value.CompareTo( other.Value ); - } - internal struct SteamAPICall_t : IEquatable, IComparable { // Name: SteamAPICall_t, Type: unsigned long long @@ -198,54 +70,6 @@ namespace Steamworks.Data public int CompareTo( AccountID_t other ) => Value.CompareTo( other.Value ); } - internal struct PartnerId_t : IEquatable, IComparable - { - // Name: PartnerId_t, Type: unsigned int - public uint Value; - - public static implicit operator PartnerId_t( uint value ) => new PartnerId_t(){ Value = value }; - public static implicit operator uint( PartnerId_t value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (PartnerId_t) p ); - public bool Equals( PartnerId_t p ) => p.Value == Value; - public static bool operator ==( PartnerId_t a, PartnerId_t b ) => a.Equals( b ); - public static bool operator !=( PartnerId_t a, PartnerId_t b ) => !a.Equals( b ); - public int CompareTo( PartnerId_t other ) => Value.CompareTo( other.Value ); - } - - internal struct ManifestId_t : IEquatable, IComparable - { - // Name: ManifestId_t, Type: unsigned long long - public ulong Value; - - public static implicit operator ManifestId_t( ulong value ) => new ManifestId_t(){ Value = value }; - public static implicit operator ulong( ManifestId_t value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (ManifestId_t) p ); - public bool Equals( ManifestId_t p ) => p.Value == Value; - public static bool operator ==( ManifestId_t a, ManifestId_t b ) => a.Equals( b ); - public static bool operator !=( ManifestId_t a, ManifestId_t b ) => !a.Equals( b ); - public int CompareTo( ManifestId_t other ) => Value.CompareTo( other.Value ); - } - - internal struct SiteId_t : IEquatable, IComparable - { - // Name: SiteId_t, Type: unsigned long long - public ulong Value; - - public static implicit operator SiteId_t( ulong value ) => new SiteId_t(){ Value = value }; - public static implicit operator ulong( SiteId_t value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (SiteId_t) p ); - public bool Equals( SiteId_t p ) => p.Value == Value; - public static bool operator ==( SiteId_t a, SiteId_t b ) => a.Equals( b ); - public static bool operator !=( SiteId_t a, SiteId_t b ) => !a.Equals( b ); - public int CompareTo( SiteId_t other ) => Value.CompareTo( other.Value ); - } - internal struct PartyBeaconID_t : IEquatable, IComparable { // Name: PartyBeaconID_t, Type: unsigned long long @@ -278,22 +102,6 @@ namespace Steamworks.Data public int CompareTo( HAuthTicket other ) => Value.CompareTo( other.Value ); } - internal struct BREAKPAD_HANDLE : IEquatable, IComparable - { - // Name: BREAKPAD_HANDLE, Type: void * - public IntPtr Value; - - public static implicit operator BREAKPAD_HANDLE( IntPtr value ) => new BREAKPAD_HANDLE(){ Value = value }; - public static implicit operator IntPtr( BREAKPAD_HANDLE value ) => value.Value; - public override string ToString() => Value.ToString(); - public override int GetHashCode() => Value.GetHashCode(); - public override bool Equals( object p ) => this.Equals( (BREAKPAD_HANDLE) p ); - public bool Equals( BREAKPAD_HANDLE p ) => p.Value == Value; - public static bool operator ==( BREAKPAD_HANDLE a, BREAKPAD_HANDLE b ) => a.Equals( b ); - public static bool operator !=( BREAKPAD_HANDLE a, BREAKPAD_HANDLE b ) => !a.Equals( b ); - public int CompareTo( BREAKPAD_HANDLE other ) => Value.ToInt64().CompareTo( other.Value.ToInt64() ); - } - internal struct HSteamPipe : IEquatable, IComparable { // Name: HSteamPipe, Type: int diff --git a/Facepunch.Steamworks/SteamInput.cs b/Facepunch.Steamworks/SteamInput.cs index d55e523..fbb18e4 100644 --- a/Facepunch.Steamworks/SteamInput.cs +++ b/Facepunch.Steamworks/SteamInput.cs @@ -22,7 +22,7 @@ namespace Steamworks /// public static void RunFrame() { - Internal.RunFrame(); + Internal.RunFrame( false ); } static readonly InputHandle_t[] queryArray = new InputHandle_t[STEAM_CONTROLLER_MAX_COUNT]; @@ -63,10 +63,39 @@ namespace Steamworks ref origin ); - return Internal.GetGlyphForActionOrigin(origin); + return Internal.GetGlyphForActionOrigin_Legacy(origin); } - internal static Dictionary DigitalHandles = new Dictionary(); + + /// + /// Return an absolute path to the PNG image glyph for the provided digital action name. The current + /// action set in use for the controller will be used for the lookup. You should cache the result and + /// maintain your own list of loaded PNG assets. + /// + public static string GetPngActionGlyph( Controller controller, string action, GlyphSize size ) + { + InputActionOrigin origin = InputActionOrigin.None; + + Internal.GetDigitalActionOrigins( controller.Handle, Internal.GetCurrentActionSet( controller.Handle ), GetDigitalActionHandle( action ), ref origin ); + + return Internal.GetGlyphPNGForActionOrigin( origin, size, 0 ); + } + + /// + /// Return an absolute path to the SVF image glyph for the provided digital action name. The current + /// action set in use for the controller will be used for the lookup. You should cache the result and + /// maintain your own list of loaded PNG assets. + /// + public static string GetSvgActionGlyph( Controller controller, string action ) + { + InputActionOrigin origin = InputActionOrigin.None; + + Internal.GetDigitalActionOrigins( controller.Handle, Internal.GetCurrentActionSet( controller.Handle ), GetDigitalActionHandle( action ), ref origin ); + + return Internal.GetGlyphSVGForActionOrigin( origin, 0 ); + } + + internal static Dictionary DigitalHandles = new Dictionary(); internal static InputDigitalActionHandle_t GetDigitalActionHandle( string name ) { if ( DigitalHandles.TryGetValue( name, out var val ) ) @@ -99,4 +128,4 @@ namespace Steamworks return val; } } -} \ No newline at end of file +} diff --git a/Facepunch.Steamworks/SteamServer.cs b/Facepunch.Steamworks/SteamServer.cs index b892760..0270256 100644 --- a/Facepunch.Steamworks/SteamServer.cs +++ b/Facepunch.Steamworks/SteamServer.cs @@ -109,7 +109,7 @@ namespace Steamworks // // Initial settings // - AutomaticHeartbeats = true; + AdvertiseServer = true; MaxPlayers = 32; BotCount = 0; Product = $"{appid.Value}"; @@ -311,27 +311,29 @@ namespace Steamworks /// Enable or disable heartbeats, which are sent regularly to the master server. /// Enabled by default. /// + [Obsolete( "Renamed to AdvertiseServer in 1.52" )] public static bool AutomaticHeartbeats { - set { Internal.EnableHeartbeats( value ); } - } - + set { Internal.SetAdvertiseServerActive( value ); } + } + + /// - /// Set heartbeat interval, if automatic heartbeats are enabled. - /// You can leave this at the default. + /// Enable or disable heartbeats, which are sent regularly to the master server. + /// Enabled by default. /// - public static int AutomaticHeartbeatRate + public static bool AdvertiseServer { - set { Internal.SetHeartbeatInterval( value ); } + set { Internal.SetAdvertiseServerActive( value ); } } /// /// Force send a heartbeat to the master server instead of waiting /// for the next automatic update (if you've left them enabled) /// + [Obsolete( "No longer used" )] public static void ForceHeartbeat() { - Internal.ForceHeartbeat(); } /// @@ -457,4 +459,4 @@ namespace Steamworks return Internal.UserHasLicenseForApp( steamid, appid ); } } -} \ No newline at end of file +} diff --git a/Generator/Cleanup.cs b/Generator/Cleanup.cs index 9ddda38..59aa9ae 100644 --- a/Generator/Cleanup.cs +++ b/Generator/Cleanup.cs @@ -18,6 +18,7 @@ public static class Cleanup type = type.Replace( "uint32", "uint" ); type = type.Replace( "int32_t", "int" ); type = type.Replace( "int64_t", "long" ); + type = type.Replace( "uint16", "ushort" ); type = type.Replace( "CSteamID", "SteamId" ); type = type.Replace( "CGameID", "GameId" ); @@ -60,10 +61,10 @@ public static class Cleanup type = type.Replace( "SteamNetworkingMessage_t", "NetMsg" ); type = type.Replace( "SteamIPAddress_t", "SteamIPAddress" ); type = type.Replace( "SteamNetworkingQuickConnectionStatus", "ConnectionStatus" ); + type = type.Replace( "SteamInputGlyphSize", "GlyphSize" ); type = type.Replace( "::", "." ); - if ( type == "EPersonaState" ) return "EFriendState"; if ( type == "PersonaState" ) return "FriendState"; @@ -103,6 +104,7 @@ public static class Cleanup if ( type == "CCallbackBase" ) return false; if ( type == "CSteamGameServerAPIContext" ) return false; if ( type == "ConnectionStatus") return false; + if ( type == "SteamInputActionEventCallbackPointer" ) return false; if ( type.StartsWith( "FnSteam" ) ) return false; return true; @@ -145,6 +147,7 @@ public static class Cleanup if ( name == "ItemPreviewType" ) return "public"; if ( name == "OverlayToStoreFlag" ) return "public"; if ( name == "TextFilteringContext" ) return "public"; + if ( name == "GlyphSize" ) return "public"; return "internal"; } @@ -156,7 +159,13 @@ public static class Cleanup if ( name == "SocketStatusCallback_t" ) return true; if ( name == "SNetSocketConnectionType" ) return true; if ( name == "SNetSocketState" ) return true; + + if ( name.StartsWith( "ISteamInput." ) ) + { + if ( name.Contains( "EnableActionEventCallbacks" ) ) return true; + } + if ( name.StartsWith( "ISteamRemoteStorage." ) ) { if ( name.Contains( "Publish" ) ) return true;