From e4663ecc68e656346c5999f070db2de168cef76f Mon Sep 17 00:00:00 2001 From: Garry Newman Date: Fri, 26 Apr 2019 14:29:36 +0100 Subject: [PATCH] AppId_t => AppId --- .../Generated/Interfaces/ISteamApps.cs | 44 ++--- .../Generated/Interfaces/ISteamFriends.cs | 8 +- .../Generated/Interfaces/ISteamGameServer.cs | 8 +- .../Interfaces/ISteamMatchmakingServers.cs | 24 +-- .../Interfaces/ISteamParentalSettings.cs | 8 +- .../Generated/Interfaces/ISteamUGC.cs | 36 ++--- .../Generated/Interfaces/ISteamUser.cs | 4 +- .../Generated/Interfaces/ISteamVideo.cs | 12 +- .../Generated/SteamStructs.cs | 150 +++++++++--------- Facepunch.Steamworks/Generated/SteamTypes.cs | 9 -- Facepunch.Steamworks/SteamApps.cs | 2 +- Generator/Cleanup.cs | 3 +- Generator/CodeWriter/Struct.cs | 6 +- Generator/CodeWriter/Types.cs | 3 + 14 files changed, 156 insertions(+), 161 deletions(-) diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs index 8e3881b..6b13bc2 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamApps.cs @@ -120,11 +120,11 @@ internal string GetAvailableGameLanguages() #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FBIsSubscribedApp( IntPtr self, AppId_t appID ); + private delegate bool FBIsSubscribedApp( IntPtr self, AppId appID ); private FBIsSubscribedApp _BIsSubscribedApp; #endregion - internal bool BIsSubscribedApp( AppId_t appID ) + internal bool BIsSubscribedApp( AppId appID ) { return _BIsSubscribedApp( Self, appID ); } @@ -132,22 +132,22 @@ internal bool BIsSubscribedApp( AppId_t appID ) #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FBIsDlcInstalled( IntPtr self, AppId_t appID ); + private delegate bool FBIsDlcInstalled( IntPtr self, AppId appID ); private FBIsDlcInstalled _BIsDlcInstalled; #endregion - internal bool BIsDlcInstalled( AppId_t appID ) + internal bool BIsDlcInstalled( AppId appID ) { return _BIsDlcInstalled( Self, appID ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate uint FGetEarliestPurchaseUnixTime( IntPtr self, AppId_t nAppID ); + private delegate uint FGetEarliestPurchaseUnixTime( IntPtr self, AppId nAppID ); private FGetEarliestPurchaseUnixTime _GetEarliestPurchaseUnixTime; #endregion - internal uint GetEarliestPurchaseUnixTime( AppId_t nAppID ) + internal uint GetEarliestPurchaseUnixTime( AppId nAppID ) { return _GetEarliestPurchaseUnixTime( Self, nAppID ); } @@ -178,44 +178,44 @@ internal int GetDLCCount() #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FBGetDLCDataByIndex( IntPtr self, int iDLC, ref AppId_t pAppID, [MarshalAs( UnmanagedType.U1 )] ref bool pbAvailable, StringBuilder pchName, int cchNameBufferSize ); + private delegate bool FBGetDLCDataByIndex( IntPtr self, int iDLC, ref AppId pAppID, [MarshalAs( UnmanagedType.U1 )] ref bool pbAvailable, StringBuilder pchName, int cchNameBufferSize ); private FBGetDLCDataByIndex _BGetDLCDataByIndex; #endregion - internal bool BGetDLCDataByIndex( int iDLC, ref AppId_t pAppID, [MarshalAs( UnmanagedType.U1 )] ref bool pbAvailable, StringBuilder pchName, int cchNameBufferSize ) + internal bool BGetDLCDataByIndex( int iDLC, ref AppId pAppID, [MarshalAs( UnmanagedType.U1 )] ref bool pbAvailable, StringBuilder pchName, int cchNameBufferSize ) { return _BGetDLCDataByIndex( Self, iDLC, ref pAppID, ref pbAvailable, pchName, cchNameBufferSize ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate void FInstallDLC( IntPtr self, AppId_t nAppID ); + private delegate void FInstallDLC( IntPtr self, AppId nAppID ); private FInstallDLC _InstallDLC; #endregion - internal void InstallDLC( AppId_t nAppID ) + internal void InstallDLC( AppId nAppID ) { _InstallDLC( Self, nAppID ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate void FUninstallDLC( IntPtr self, AppId_t nAppID ); + private delegate void FUninstallDLC( IntPtr self, AppId nAppID ); private FUninstallDLC _UninstallDLC; #endregion - internal void UninstallDLC( AppId_t nAppID ) + internal void UninstallDLC( AppId nAppID ) { _UninstallDLC( Self, nAppID ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate void FRequestAppProofOfPurchaseKey( IntPtr self, AppId_t nAppID ); + private delegate void FRequestAppProofOfPurchaseKey( IntPtr self, AppId nAppID ); private FRequestAppProofOfPurchaseKey _RequestAppProofOfPurchaseKey; #endregion - internal void RequestAppProofOfPurchaseKey( AppId_t nAppID ) + internal void RequestAppProofOfPurchaseKey( AppId nAppID ) { _RequestAppProofOfPurchaseKey( Self, nAppID ); } @@ -246,22 +246,22 @@ internal bool MarkContentCorrupt( [MarshalAs( UnmanagedType.U1 )] bool bMissingF #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate uint FGetInstalledDepots( IntPtr self, AppId_t appID, [In,Out] DepotId_t[] pvecDepots, uint cMaxDepots ); + private delegate uint FGetInstalledDepots( IntPtr self, AppId appID, [In,Out] DepotId_t[] pvecDepots, uint cMaxDepots ); private FGetInstalledDepots _GetInstalledDepots; #endregion - internal uint GetInstalledDepots( AppId_t appID, [In,Out] DepotId_t[] pvecDepots, uint cMaxDepots ) + internal uint GetInstalledDepots( AppId appID, [In,Out] DepotId_t[] pvecDepots, uint cMaxDepots ) { return _GetInstalledDepots( Self, appID, pvecDepots, cMaxDepots ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate uint FGetAppInstallDir( IntPtr self, AppId_t appID, StringBuilder pchFolder, uint cchFolderBufferSize ); + private delegate uint FGetAppInstallDir( IntPtr self, AppId appID, StringBuilder pchFolder, uint cchFolderBufferSize ); private FGetAppInstallDir _GetAppInstallDir; #endregion - internal uint GetAppInstallDir( AppId_t appID, StringBuilder pchFolder, uint cchFolderBufferSize ) + internal uint GetAppInstallDir( AppId appID, StringBuilder pchFolder, uint cchFolderBufferSize ) { return _GetAppInstallDir( Self, appID, pchFolder, cchFolderBufferSize ); } @@ -269,11 +269,11 @@ internal uint GetAppInstallDir( AppId_t appID, StringBuilder pchFolder, uint cch #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FBIsAppInstalled( IntPtr self, AppId_t appID ); + private delegate bool FBIsAppInstalled( IntPtr self, AppId appID ); private FBIsAppInstalled _BIsAppInstalled; #endregion - internal bool BIsAppInstalled( AppId_t appID ) + internal bool BIsAppInstalled( AppId appID ) { return _BIsAppInstalled( Self, appID ); } @@ -305,11 +305,11 @@ internal string GetLaunchQueryParam( string pchKey ) #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetDlcDownloadProgress( IntPtr self, AppId_t nAppID, ref ulong punBytesDownloaded, ref ulong punBytesTotal ); + private delegate bool FGetDlcDownloadProgress( IntPtr self, AppId nAppID, ref ulong punBytesDownloaded, ref ulong punBytesTotal ); private FGetDlcDownloadProgress _GetDlcDownloadProgress; #endregion - internal bool GetDlcDownloadProgress( AppId_t nAppID, ref ulong punBytesDownloaded, ref ulong punBytesTotal ) + internal bool GetDlcDownloadProgress( AppId nAppID, ref ulong punBytesDownloaded, ref ulong punBytesTotal ) { return _GetDlcDownloadProgress( Self, nAppID, ref punBytesDownloaded, ref punBytesTotal ); } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamFriends.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamFriends.cs index 25d2de8..d7cdea8 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamFriends.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamFriends.cs @@ -445,11 +445,11 @@ internal void ActivateGameOverlayToWebPage( string pchURL, ActivateGameOverlayTo #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate void FActivateGameOverlayToStore( IntPtr self, AppId_t nAppID, OverlayToStoreFlag eFlag ); + private delegate void FActivateGameOverlayToStore( IntPtr self, AppId nAppID, OverlayToStoreFlag eFlag ); private FActivateGameOverlayToStore _ActivateGameOverlayToStore; #endregion - internal void ActivateGameOverlayToStore( AppId_t nAppID, OverlayToStoreFlag eFlag ) + internal void ActivateGameOverlayToStore( AppId nAppID, OverlayToStoreFlag eFlag ) { _ActivateGameOverlayToStore( Self, nAppID, eFlag ); } @@ -696,11 +696,11 @@ internal int GetFriendCoplayTime( SteamId steamIDFriend ) #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate AppId_t FGetFriendCoplayGame( IntPtr self, SteamId steamIDFriend ); + private delegate AppId FGetFriendCoplayGame( IntPtr self, SteamId steamIDFriend ); private FGetFriendCoplayGame _GetFriendCoplayGame; #endregion - internal AppId_t GetFriendCoplayGame( SteamId steamIDFriend ) + internal AppId GetFriendCoplayGame( SteamId steamIDFriend ) { return _GetFriendCoplayGame( Self, steamIDFriend ); } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs index 5a71bdd..db98f8b 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamGameServer.cs @@ -66,11 +66,11 @@ public override void InitInternals() #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FInitGameServer( IntPtr self, uint unIP, ushort usGamePort, ushort usQueryPort, uint unFlags, AppId_t nGameAppId, string pchVersionString ); + private delegate bool FInitGameServer( IntPtr self, uint unIP, ushort usGamePort, ushort usQueryPort, uint unFlags, AppId nGameAppId, string pchVersionString ); private FInitGameServer _InitGameServer; #endregion - internal bool InitGameServer( uint unIP, ushort usGamePort, ushort usQueryPort, uint unFlags, AppId_t nGameAppId, string pchVersionString ) + internal bool InitGameServer( uint unIP, ushort usGamePort, ushort usQueryPort, uint unFlags, AppId nGameAppId, string pchVersionString ) { return _InitGameServer( Self, unIP, usGamePort, usQueryPort, unFlags, nGameAppId, pchVersionString ); } @@ -427,11 +427,11 @@ internal void CancelAuthTicket( HAuthTicket hAuthTicket ) #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate UserHasLicenseForAppResult FUserHasLicenseForApp( IntPtr self, SteamId steamID, AppId_t appID ); + private delegate UserHasLicenseForAppResult FUserHasLicenseForApp( IntPtr self, SteamId steamID, AppId appID ); private FUserHasLicenseForApp _UserHasLicenseForApp; #endregion - internal UserHasLicenseForAppResult UserHasLicenseForApp( SteamId steamID, AppId_t appID ) + internal UserHasLicenseForAppResult UserHasLicenseForApp( SteamId steamID, AppId appID ) { return _UserHasLicenseForApp( Self, steamID, appID ); } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmakingServers.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmakingServers.cs index 46f873b..4d89041 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmakingServers.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamMatchmakingServers.cs @@ -38,66 +38,66 @@ public override void InitInternals() #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate HServerListRequest FRequestInternetServerList( IntPtr self, AppId_t iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ); + private delegate HServerListRequest FRequestInternetServerList( IntPtr self, AppId iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ); private FRequestInternetServerList _RequestInternetServerList; #endregion - internal HServerListRequest RequestInternetServerList( AppId_t iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) + internal HServerListRequest RequestInternetServerList( AppId iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) { return _RequestInternetServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate HServerListRequest FRequestLANServerList( IntPtr self, AppId_t iApp, IntPtr pRequestServersResponse ); + private delegate HServerListRequest FRequestLANServerList( IntPtr self, AppId iApp, IntPtr pRequestServersResponse ); private FRequestLANServerList _RequestLANServerList; #endregion - internal HServerListRequest RequestLANServerList( AppId_t iApp, IntPtr pRequestServersResponse ) + internal HServerListRequest RequestLANServerList( AppId iApp, IntPtr pRequestServersResponse ) { return _RequestLANServerList( Self, iApp, pRequestServersResponse ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate HServerListRequest FRequestFriendsServerList( IntPtr self, AppId_t iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ); + private delegate HServerListRequest FRequestFriendsServerList( IntPtr self, AppId iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ); private FRequestFriendsServerList _RequestFriendsServerList; #endregion - internal HServerListRequest RequestFriendsServerList( AppId_t iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) + internal HServerListRequest RequestFriendsServerList( AppId iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) { return _RequestFriendsServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate HServerListRequest FRequestFavoritesServerList( IntPtr self, AppId_t iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ); + private delegate HServerListRequest FRequestFavoritesServerList( IntPtr self, AppId iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ); private FRequestFavoritesServerList _RequestFavoritesServerList; #endregion - internal HServerListRequest RequestFavoritesServerList( AppId_t iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) + internal HServerListRequest RequestFavoritesServerList( AppId iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) { return _RequestFavoritesServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate HServerListRequest FRequestHistoryServerList( IntPtr self, AppId_t iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ); + private delegate HServerListRequest FRequestHistoryServerList( IntPtr self, AppId iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ); private FRequestHistoryServerList _RequestHistoryServerList; #endregion - internal HServerListRequest RequestHistoryServerList( AppId_t iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) + internal HServerListRequest RequestHistoryServerList( AppId iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) { return _RequestHistoryServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate HServerListRequest FRequestSpectatorServerList( IntPtr self, AppId_t iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ); + private delegate HServerListRequest FRequestSpectatorServerList( IntPtr self, AppId iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ); private FRequestSpectatorServerList _RequestSpectatorServerList; #endregion - internal HServerListRequest RequestSpectatorServerList( AppId_t iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) + internal HServerListRequest RequestSpectatorServerList( AppId iApp, [In,Out] ref MatchMakingKeyValuePair_t[] ppchFilters, uint nFilters, IntPtr pRequestServersResponse ) { return _RequestSpectatorServerList( Self, iApp, ref ppchFilters, nFilters, pRequestServersResponse ); } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamParentalSettings.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamParentalSettings.cs index ce13528..cd02329 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamParentalSettings.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamParentalSettings.cs @@ -52,11 +52,11 @@ internal bool BIsParentalLockLocked() #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FBIsAppBlocked( IntPtr self, AppId_t nAppID ); + private delegate bool FBIsAppBlocked( IntPtr self, AppId nAppID ); private FBIsAppBlocked _BIsAppBlocked; #endregion - internal bool BIsAppBlocked( AppId_t nAppID ) + internal bool BIsAppBlocked( AppId nAppID ) { return _BIsAppBlocked( Self, nAppID ); } @@ -64,11 +64,11 @@ internal bool BIsAppBlocked( AppId_t nAppID ) #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FBIsAppInBlockList( IntPtr self, AppId_t nAppID ); + private delegate bool FBIsAppInBlockList( IntPtr self, AppId nAppID ); private FBIsAppInBlockList _BIsAppInBlockList; #endregion - internal bool BIsAppInBlockList( AppId_t nAppID ) + internal bool BIsAppInBlockList( AppId nAppID ) { return _BIsAppInBlockList( Self, nAppID ); } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs index 2a132e8..eb02ee5 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUGC.cs @@ -97,33 +97,33 @@ public override void InitInternals() #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate UGCQueryHandle_t FCreateQueryUserUGCRequest( IntPtr self, AccountID_t unAccountID, UserUGCList eListType, UgcType eMatchingUGCType, UserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint unPage ); + private delegate UGCQueryHandle_t FCreateQueryUserUGCRequest( IntPtr self, AccountID_t unAccountID, UserUGCList eListType, UgcType eMatchingUGCType, UserUGCListSortOrder eSortOrder, AppId nCreatorAppID, AppId nConsumerAppID, uint unPage ); private FCreateQueryUserUGCRequest _CreateQueryUserUGCRequest; #endregion - internal UGCQueryHandle_t CreateQueryUserUGCRequest( AccountID_t unAccountID, UserUGCList eListType, UgcType eMatchingUGCType, UserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint unPage ) + internal UGCQueryHandle_t CreateQueryUserUGCRequest( AccountID_t unAccountID, UserUGCList eListType, UgcType eMatchingUGCType, UserUGCListSortOrder eSortOrder, AppId nCreatorAppID, AppId nConsumerAppID, uint unPage ) { return _CreateQueryUserUGCRequest( Self, unAccountID, eListType, eMatchingUGCType, eSortOrder, nCreatorAppID, nConsumerAppID, unPage ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate UGCQueryHandle_t FCreateQueryAllUGCRequest1( IntPtr self, UGCQuery eQueryType, UgcType eMatchingeMatchingUGCTypeFileType, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint unPage ); + private delegate UGCQueryHandle_t FCreateQueryAllUGCRequest1( IntPtr self, UGCQuery eQueryType, UgcType eMatchingeMatchingUGCTypeFileType, AppId nCreatorAppID, AppId nConsumerAppID, uint unPage ); private FCreateQueryAllUGCRequest1 _CreateQueryAllUGCRequest1; #endregion - internal UGCQueryHandle_t CreateQueryAllUGCRequest1( UGCQuery eQueryType, UgcType eMatchingeMatchingUGCTypeFileType, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint unPage ) + internal UGCQueryHandle_t CreateQueryAllUGCRequest1( UGCQuery eQueryType, UgcType eMatchingeMatchingUGCTypeFileType, AppId nCreatorAppID, AppId nConsumerAppID, uint unPage ) { return _CreateQueryAllUGCRequest1( Self, eQueryType, eMatchingeMatchingUGCTypeFileType, nCreatorAppID, nConsumerAppID, unPage ); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate UGCQueryHandle_t FCreateQueryAllUGCRequest2( IntPtr self, UGCQuery eQueryType, UgcType eMatchingeMatchingUGCTypeFileType, AppId_t nCreatorAppID, AppId_t nConsumerAppID, string pchCursor ); + private delegate UGCQueryHandle_t FCreateQueryAllUGCRequest2( IntPtr self, UGCQuery eQueryType, UgcType eMatchingeMatchingUGCTypeFileType, AppId nCreatorAppID, AppId nConsumerAppID, string pchCursor ); private FCreateQueryAllUGCRequest2 _CreateQueryAllUGCRequest2; #endregion - internal UGCQueryHandle_t CreateQueryAllUGCRequest2( UGCQuery eQueryType, UgcType eMatchingeMatchingUGCTypeFileType, AppId_t nCreatorAppID, AppId_t nConsumerAppID, string pchCursor ) + internal UGCQueryHandle_t CreateQueryAllUGCRequest2( UGCQuery eQueryType, UgcType eMatchingeMatchingUGCTypeFileType, AppId nCreatorAppID, AppId nConsumerAppID, string pchCursor ) { return _CreateQueryAllUGCRequest2( Self, eQueryType, eMatchingeMatchingUGCTypeFileType, nCreatorAppID, nConsumerAppID, pchCursor ); } @@ -485,22 +485,22 @@ internal bool AddRequiredKeyValueTag( UGCQueryHandle_t handle, string pKey, stri #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate SteamAPICall_t FCreateItem( IntPtr self, AppId_t nConsumerAppId, WorkshopFileType eFileType ); + private delegate SteamAPICall_t FCreateItem( IntPtr self, AppId nConsumerAppId, WorkshopFileType eFileType ); private FCreateItem _CreateItem; #endregion - internal async Task CreateItem( AppId_t nConsumerAppId, WorkshopFileType eFileType ) + internal async Task CreateItem( AppId nConsumerAppId, WorkshopFileType eFileType ) { return await (new Result( _CreateItem( Self, nConsumerAppId, eFileType ) )).GetResult(); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate UGCUpdateHandle_t FStartItemUpdate( IntPtr self, AppId_t nConsumerAppId, PublishedFileId nPublishedFileID ); + private delegate UGCUpdateHandle_t FStartItemUpdate( IntPtr self, AppId nConsumerAppId, PublishedFileId nPublishedFileID ); private FStartItemUpdate _StartItemUpdate; #endregion - internal UGCUpdateHandle_t StartItemUpdate( AppId_t nConsumerAppId, PublishedFileId nPublishedFileID ) + internal UGCUpdateHandle_t StartItemUpdate( AppId nConsumerAppId, PublishedFileId nPublishedFileID ) { return _StartItemUpdate( Self, nConsumerAppId, nPublishedFileID ); } @@ -743,22 +743,22 @@ internal ItemUpdateStatus GetItemUpdateProgress( UGCUpdateHandle_t handle, ref u #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate SteamAPICall_t FAddItemToFavorites( IntPtr self, AppId_t nAppId, PublishedFileId nPublishedFileID ); + private delegate SteamAPICall_t FAddItemToFavorites( IntPtr self, AppId nAppId, PublishedFileId nPublishedFileID ); private FAddItemToFavorites _AddItemToFavorites; #endregion - internal async Task AddItemToFavorites( AppId_t nAppId, PublishedFileId nPublishedFileID ) + internal async Task AddItemToFavorites( AppId nAppId, PublishedFileId nPublishedFileID ) { return await (new Result( _AddItemToFavorites( Self, nAppId, nPublishedFileID ) )).GetResult(); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate SteamAPICall_t FRemoveItemFromFavorites( IntPtr self, AppId_t nAppId, PublishedFileId nPublishedFileID ); + private delegate SteamAPICall_t FRemoveItemFromFavorites( IntPtr self, AppId nAppId, PublishedFileId nPublishedFileID ); private FRemoveItemFromFavorites _RemoveItemFromFavorites; #endregion - internal async Task RemoveItemFromFavorites( AppId_t nAppId, PublishedFileId nPublishedFileID ) + internal async Task RemoveItemFromFavorites( AppId nAppId, PublishedFileId nPublishedFileID ) { return await (new Result( _RemoveItemFromFavorites( Self, nAppId, nPublishedFileID ) )).GetResult(); } @@ -934,22 +934,22 @@ internal void SuspendDownloads( [MarshalAs( UnmanagedType.U1 )] bool bSuspend ) #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate SteamAPICall_t FAddAppDependency( IntPtr self, PublishedFileId nPublishedFileID, AppId_t nAppID ); + private delegate SteamAPICall_t FAddAppDependency( IntPtr self, PublishedFileId nPublishedFileID, AppId nAppID ); private FAddAppDependency _AddAppDependency; #endregion - internal async Task AddAppDependency( PublishedFileId nPublishedFileID, AppId_t nAppID ) + internal async Task AddAppDependency( PublishedFileId nPublishedFileID, AppId nAppID ) { return await (new Result( _AddAppDependency( Self, nPublishedFileID, nAppID ) )).GetResult(); } #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate SteamAPICall_t FRemoveAppDependency( IntPtr self, PublishedFileId nPublishedFileID, AppId_t nAppID ); + private delegate SteamAPICall_t FRemoveAppDependency( IntPtr self, PublishedFileId nPublishedFileID, AppId nAppID ); private FRemoveAppDependency _RemoveAppDependency; #endregion - internal async Task RemoveAppDependency( PublishedFileId nPublishedFileID, AppId_t nAppID ) + internal async Task RemoveAppDependency( PublishedFileId nPublishedFileID, AppId nAppID ) { return await (new Result( _RemoveAppDependency( Self, nPublishedFileID, nAppID ) )).GetResult(); } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs index ce4f29c..f2ef301 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamUser.cs @@ -242,11 +242,11 @@ internal void CancelAuthTicket( HAuthTicket hAuthTicket ) #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate UserHasLicenseForAppResult FUserHasLicenseForApp( IntPtr self, SteamId steamID, AppId_t appID ); + private delegate UserHasLicenseForAppResult FUserHasLicenseForApp( IntPtr self, SteamId steamID, AppId appID ); private FUserHasLicenseForApp _UserHasLicenseForApp; #endregion - internal UserHasLicenseForAppResult UserHasLicenseForApp( SteamId steamID, AppId_t appID ) + internal UserHasLicenseForAppResult UserHasLicenseForApp( SteamId steamID, AppId appID ) { return _UserHasLicenseForApp( Self, steamID, appID ); } diff --git a/Facepunch.Steamworks/Generated/Interfaces/ISteamVideo.cs b/Facepunch.Steamworks/Generated/Interfaces/ISteamVideo.cs index 1107826..13a03f3 100644 --- a/Facepunch.Steamworks/Generated/Interfaces/ISteamVideo.cs +++ b/Facepunch.Steamworks/Generated/Interfaces/ISteamVideo.cs @@ -25,11 +25,11 @@ public override void InitInternals() #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate void FGetVideoURL( IntPtr self, AppId_t unVideoAppID ); + private delegate void FGetVideoURL( IntPtr self, AppId unVideoAppID ); private FGetVideoURL _GetVideoURL; #endregion - internal void GetVideoURL( AppId_t unVideoAppID ) + internal void GetVideoURL( AppId unVideoAppID ) { _GetVideoURL( Self, unVideoAppID ); } @@ -48,11 +48,11 @@ internal bool IsBroadcasting( ref int pnNumViewers ) #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] - private delegate void FGetOPFSettings( IntPtr self, AppId_t unVideoAppID ); + private delegate void FGetOPFSettings( IntPtr self, AppId unVideoAppID ); private FGetOPFSettings _GetOPFSettings; #endregion - internal void GetOPFSettings( AppId_t unVideoAppID ) + internal void GetOPFSettings( AppId unVideoAppID ) { _GetOPFSettings( Self, unVideoAppID ); } @@ -60,11 +60,11 @@ internal void GetOPFSettings( AppId_t unVideoAppID ) #region FunctionMeta [UnmanagedFunctionPointer( CallingConvention.ThisCall )] [return: MarshalAs( UnmanagedType.I1 )] - private delegate bool FGetOPFStringForApp( IntPtr self, AppId_t unVideoAppID, StringBuilder pchBuffer, ref int pnBufferSize ); + private delegate bool FGetOPFStringForApp( IntPtr self, AppId unVideoAppID, StringBuilder pchBuffer, ref int pnBufferSize ); private FGetOPFStringForApp _GetOPFStringForApp; #endregion - internal bool GetOPFStringForApp( AppId_t unVideoAppID, StringBuilder pchBuffer, ref int pnBufferSize ) + internal bool GetOPFStringForApp( AppId unVideoAppID, StringBuilder pchBuffer, ref int pnBufferSize ) { return _GetOPFStringForApp( Self, unVideoAppID, pchBuffer, ref pnBufferSize ); } diff --git a/Facepunch.Steamworks/Generated/SteamStructs.cs b/Facepunch.Steamworks/Generated/SteamStructs.cs index 3eee820..ff43efb 100644 --- a/Facepunch.Steamworks/Generated/SteamStructs.cs +++ b/Facepunch.Steamworks/Generated/SteamStructs.cs @@ -645,7 +645,7 @@ public struct Pack8 internal struct FriendRichPresenceUpdate_t : Steamworks.ISteamCallback { internal ulong SteamIDFriend; // m_steamIDFriend class CSteamID - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t #region ISteamCallback public int GetCallbackId() => CallbackIdentifiers.SteamFriends + 36; @@ -657,7 +657,7 @@ internal struct FriendRichPresenceUpdate_t : Steamworks.ISteamCallback public struct Pack4 { internal ulong SteamIDFriend; // m_steamIDFriend class CSteamID - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator FriendRichPresenceUpdate_t ( FriendRichPresenceUpdate_t.Pack4 d ) => new FriendRichPresenceUpdate_t{ SteamIDFriend = d.SteamIDFriend,AppID = d.AppID, }; } @@ -666,7 +666,7 @@ public struct Pack4 public struct Pack8 { internal ulong SteamIDFriend; // m_steamIDFriend class CSteamID - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator FriendRichPresenceUpdate_t ( FriendRichPresenceUpdate_t.Pack8 d ) => new FriendRichPresenceUpdate_t{ SteamIDFriend = d.SteamIDFriend,AppID = d.AppID, }; } @@ -2246,7 +2246,7 @@ public struct Pack8 internal struct RemoteStorageAppSyncedClient_t : Steamworks.ISteamCallback { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal Result Result; // m_eResult enum EResult internal int NumDownloads; // m_unNumDownloads int @@ -2259,7 +2259,7 @@ internal struct RemoteStorageAppSyncedClient_t : Steamworks.ISteamCallback [StructLayout( LayoutKind.Sequential, Pack = 4 )] public struct Pack4 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal Result Result; // m_eResult enum EResult internal int NumDownloads; // m_unNumDownloads int @@ -2269,7 +2269,7 @@ public struct Pack4 [StructLayout( LayoutKind.Sequential, Pack = 8 )] public struct Pack8 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal Result Result; // m_eResult enum EResult internal int NumDownloads; // m_unNumDownloads int @@ -2280,7 +2280,7 @@ public struct Pack8 internal struct RemoteStorageAppSyncedServer_t : Steamworks.ISteamCallback { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal Result Result; // m_eResult enum EResult internal int NumUploads; // m_unNumUploads int @@ -2293,7 +2293,7 @@ internal struct RemoteStorageAppSyncedServer_t : Steamworks.ISteamCallback [StructLayout( LayoutKind.Sequential, Pack = 4 )] public struct Pack4 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal Result Result; // m_eResult enum EResult internal int NumUploads; // m_unNumUploads int @@ -2303,7 +2303,7 @@ public struct Pack4 [StructLayout( LayoutKind.Sequential, Pack = 8 )] public struct Pack8 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal Result Result; // m_eResult enum EResult internal int NumUploads; // m_unNumUploads int @@ -2316,7 +2316,7 @@ internal struct RemoteStorageAppSyncProgress_t : Steamworks.ISteamCallback { [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)] internal string CurrentFile; // m_rgchCurrentFile char [260] - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal uint BytesTransferredThisChunk; // m_uBytesTransferredThisChunk uint32 internal double DAppPercentComplete; // m_dAppPercentComplete double [MarshalAs(UnmanagedType.I1)] @@ -2333,7 +2333,7 @@ public struct Pack4 { [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)] internal string CurrentFile; // m_rgchCurrentFile char [260] - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal uint BytesTransferredThisChunk; // m_uBytesTransferredThisChunk uint32 internal double DAppPercentComplete; // m_dAppPercentComplete double [MarshalAs(UnmanagedType.I1)] @@ -2347,7 +2347,7 @@ public struct Pack8 { [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)] internal string CurrentFile; // m_rgchCurrentFile char [260] - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal uint BytesTransferredThisChunk; // m_uBytesTransferredThisChunk uint32 internal double DAppPercentComplete; // m_dAppPercentComplete double [MarshalAs(UnmanagedType.I1)] @@ -2360,7 +2360,7 @@ public struct Pack8 internal struct RemoteStorageAppSyncStatusCheck_t : Steamworks.ISteamCallback { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal Result Result; // m_eResult enum EResult #region ISteamCallback @@ -2372,7 +2372,7 @@ internal struct RemoteStorageAppSyncStatusCheck_t : Steamworks.ISteamCallback [StructLayout( LayoutKind.Sequential, Pack = 4 )] public struct Pack4 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal Result Result; // m_eResult enum EResult public static implicit operator RemoteStorageAppSyncStatusCheck_t ( RemoteStorageAppSyncStatusCheck_t.Pack4 d ) => new RemoteStorageAppSyncStatusCheck_t{ AppID = d.AppID,Result = d.Result, }; @@ -2381,7 +2381,7 @@ public struct Pack4 [StructLayout( LayoutKind.Sequential, Pack = 8 )] public struct Pack8 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal Result Result; // m_eResult enum EResult public static implicit operator RemoteStorageAppSyncStatusCheck_t ( RemoteStorageAppSyncStatusCheck_t.Pack8 d ) => new RemoteStorageAppSyncStatusCheck_t{ AppID = d.AppID,Result = d.Result, }; @@ -2683,7 +2683,7 @@ internal struct RemoteStorageDownloadUGCResult_t : Steamworks.ISteamCallback { internal Result Result; // m_eResult enum EResult internal ulong File; // m_hFile UGCHandle_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal int SizeInBytes; // m_nSizeInBytes int32 [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)] internal string PchFileName; // m_pchFileName char [260] @@ -2700,7 +2700,7 @@ public struct Pack4 { internal Result Result; // m_eResult enum EResult internal ulong File; // m_hFile UGCHandle_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal int SizeInBytes; // m_nSizeInBytes int32 [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)] internal string PchFileName; // m_pchFileName char [260] @@ -2714,7 +2714,7 @@ public struct Pack8 { internal Result Result; // m_eResult enum EResult internal ulong File; // m_hFile UGCHandle_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal int SizeInBytes; // m_nSizeInBytes int32 [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)] internal string PchFileName; // m_pchFileName char [260] @@ -2729,8 +2729,8 @@ internal struct RemoteStorageGetPublishedFileDetailsResult_t : Steamworks.ISteam { internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint CreatorAppID; // m_nCreatorAppID AppId_t - internal uint ConsumerAppID; // m_nConsumerAppID AppId_t + internal AppId CreatorAppID; // m_nCreatorAppID AppId_t + internal AppId ConsumerAppID; // m_nConsumerAppID AppId_t [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 129)] internal string Title; // m_rgchTitle char [129] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8000)] @@ -2768,8 +2768,8 @@ public struct Pack4 { internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint CreatorAppID; // m_nCreatorAppID AppId_t - internal uint ConsumerAppID; // m_nConsumerAppID AppId_t + internal AppId CreatorAppID; // m_nCreatorAppID AppId_t + internal AppId ConsumerAppID; // m_nConsumerAppID AppId_t [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 129)] internal string Title; // m_rgchTitle char [129] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8000)] @@ -2804,8 +2804,8 @@ public struct Pack8 { internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint CreatorAppID; // m_nCreatorAppID AppId_t - internal uint ConsumerAppID; // m_nConsumerAppID AppId_t + internal AppId CreatorAppID; // m_nCreatorAppID AppId_t + internal AppId ConsumerAppID; // m_nConsumerAppID AppId_t [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 129)] internal string Title; // m_rgchTitle char [129] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8000)] @@ -2846,7 +2846,7 @@ internal struct RemoteStorageEnumerateWorkshopFilesResult_t : Steamworks.ISteamC internal PublishedFileId[] GPublishedFileId; // m_rgPublishedFileId PublishedFileId_t [50] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 50, ArraySubType = UnmanagedType.R4)] internal float[] GScore; // m_rgScore float [50] - internal uint AppId; // m_nAppId AppId_t + internal AppId AppId; // m_nAppId AppId_t internal uint StartIndex; // m_unStartIndex uint32 #region ISteamCallback @@ -2865,7 +2865,7 @@ public struct Pack4 internal PublishedFileId[] GPublishedFileId; // m_rgPublishedFileId PublishedFileId_t [50] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 50, ArraySubType = UnmanagedType.R4)] internal float[] GScore; // m_rgScore float [50] - internal uint AppId; // m_nAppId AppId_t + internal AppId AppId; // m_nAppId AppId_t internal uint StartIndex; // m_unStartIndex uint32 public static implicit operator RemoteStorageEnumerateWorkshopFilesResult_t ( RemoteStorageEnumerateWorkshopFilesResult_t.Pack4 d ) => new RemoteStorageEnumerateWorkshopFilesResult_t{ Result = d.Result,ResultsReturned = d.ResultsReturned,TotalResultCount = d.TotalResultCount,GPublishedFileId = d.GPublishedFileId,GScore = d.GScore,AppId = d.AppId,StartIndex = d.StartIndex, }; @@ -2881,7 +2881,7 @@ public struct Pack8 internal PublishedFileId[] GPublishedFileId; // m_rgPublishedFileId PublishedFileId_t [50] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 50, ArraySubType = UnmanagedType.R4)] internal float[] GScore; // m_rgScore float [50] - internal uint AppId; // m_nAppId AppId_t + internal AppId AppId; // m_nAppId AppId_t internal uint StartIndex; // m_unStartIndex uint32 public static implicit operator RemoteStorageEnumerateWorkshopFilesResult_t ( RemoteStorageEnumerateWorkshopFilesResult_t.Pack8 d ) => new RemoteStorageEnumerateWorkshopFilesResult_t{ Result = d.Result,ResultsReturned = d.ResultsReturned,TotalResultCount = d.TotalResultCount,GPublishedFileId = d.GPublishedFileId,GScore = d.GScore,AppId = d.AppId,StartIndex = d.StartIndex, }; @@ -2935,7 +2935,7 @@ public struct Pack8 internal struct RemoteStoragePublishedFileSubscribed_t : Steamworks.ISteamCallback { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t #region ISteamCallback public int GetCallbackId() => CallbackIdentifiers.ClientRemoteStorage + 21; @@ -2947,7 +2947,7 @@ internal struct RemoteStoragePublishedFileSubscribed_t : Steamworks.ISteamCallba public struct Pack4 { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator RemoteStoragePublishedFileSubscribed_t ( RemoteStoragePublishedFileSubscribed_t.Pack4 d ) => new RemoteStoragePublishedFileSubscribed_t{ PublishedFileId = d.PublishedFileId,AppID = d.AppID, }; } @@ -2956,7 +2956,7 @@ public struct Pack4 public struct Pack8 { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator RemoteStoragePublishedFileSubscribed_t ( RemoteStoragePublishedFileSubscribed_t.Pack8 d ) => new RemoteStoragePublishedFileSubscribed_t{ PublishedFileId = d.PublishedFileId,AppID = d.AppID, }; } @@ -2966,7 +2966,7 @@ public struct Pack8 internal struct RemoteStoragePublishedFileUnsubscribed_t : Steamworks.ISteamCallback { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t #region ISteamCallback public int GetCallbackId() => CallbackIdentifiers.ClientRemoteStorage + 22; @@ -2978,7 +2978,7 @@ internal struct RemoteStoragePublishedFileUnsubscribed_t : Steamworks.ISteamCall public struct Pack4 { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator RemoteStoragePublishedFileUnsubscribed_t ( RemoteStoragePublishedFileUnsubscribed_t.Pack4 d ) => new RemoteStoragePublishedFileUnsubscribed_t{ PublishedFileId = d.PublishedFileId,AppID = d.AppID, }; } @@ -2987,7 +2987,7 @@ public struct Pack4 public struct Pack8 { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator RemoteStoragePublishedFileUnsubscribed_t ( RemoteStoragePublishedFileUnsubscribed_t.Pack8 d ) => new RemoteStoragePublishedFileUnsubscribed_t{ PublishedFileId = d.PublishedFileId,AppID = d.AppID, }; } @@ -2997,7 +2997,7 @@ public struct Pack8 internal struct RemoteStoragePublishedFileDeleted_t : Steamworks.ISteamCallback { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t #region ISteamCallback public int GetCallbackId() => CallbackIdentifiers.ClientRemoteStorage + 23; @@ -3009,7 +3009,7 @@ internal struct RemoteStoragePublishedFileDeleted_t : Steamworks.ISteamCallback public struct Pack4 { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator RemoteStoragePublishedFileDeleted_t ( RemoteStoragePublishedFileDeleted_t.Pack4 d ) => new RemoteStoragePublishedFileDeleted_t{ PublishedFileId = d.PublishedFileId,AppID = d.AppID, }; } @@ -3018,7 +3018,7 @@ public struct Pack4 public struct Pack8 { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator RemoteStoragePublishedFileDeleted_t ( RemoteStoragePublishedFileDeleted_t.Pack8 d ) => new RemoteStoragePublishedFileDeleted_t{ PublishedFileId = d.PublishedFileId,AppID = d.AppID, }; } @@ -3250,7 +3250,7 @@ public struct Pack8 internal struct RemoteStoragePublishedFileUpdated_t : Steamworks.ISteamCallback { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal ulong Unused; // m_ulUnused uint64 #region ISteamCallback @@ -3263,7 +3263,7 @@ internal struct RemoteStoragePublishedFileUpdated_t : Steamworks.ISteamCallback public struct Pack4 { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal ulong Unused; // m_ulUnused uint64 public static implicit operator RemoteStoragePublishedFileUpdated_t ( RemoteStoragePublishedFileUpdated_t.Pack4 d ) => new RemoteStoragePublishedFileUpdated_t{ PublishedFileId = d.PublishedFileId,AppID = d.AppID,Unused = d.Unused, }; @@ -3273,7 +3273,7 @@ public struct Pack4 public struct Pack8 { internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t internal ulong Unused; // m_ulUnused uint64 public static implicit operator RemoteStoragePublishedFileUpdated_t ( RemoteStoragePublishedFileUpdated_t.Pack8 d ) => new RemoteStoragePublishedFileUpdated_t{ PublishedFileId = d.PublishedFileId,AppID = d.AppID,Unused = d.Unused, }; @@ -3835,7 +3835,7 @@ public struct Pack8 internal struct DlcInstalled_t : Steamworks.ISteamCallback { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t #region ISteamCallback public int GetCallbackId() => CallbackIdentifiers.SteamApps + 5; @@ -3846,7 +3846,7 @@ internal struct DlcInstalled_t : Steamworks.ISteamCallback [StructLayout( LayoutKind.Sequential, Pack = 4 )] public struct Pack4 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator DlcInstalled_t ( DlcInstalled_t.Pack4 d ) => new DlcInstalled_t{ AppID = d.AppID, }; } @@ -3854,7 +3854,7 @@ public struct Pack4 [StructLayout( LayoutKind.Sequential, Pack = 8 )] public struct Pack8 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator DlcInstalled_t ( DlcInstalled_t.Pack8 d ) => new DlcInstalled_t{ AppID = d.AppID, }; } @@ -4465,8 +4465,8 @@ internal struct SteamUGCDetails_t internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t internal Result Result; // m_eResult enum EResult internal WorkshopFileType FileType; // m_eFileType enum EWorkshopFileType - internal uint CreatorAppID; // m_nCreatorAppID AppId_t - internal uint ConsumerAppID; // m_nConsumerAppID AppId_t + internal AppId CreatorAppID; // m_nCreatorAppID AppId_t + internal AppId ConsumerAppID; // m_nConsumerAppID AppId_t [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 129)] internal string Title; // m_rgchTitle char [129] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8000)] @@ -4508,8 +4508,8 @@ public struct Pack4 internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t internal Result Result; // m_eResult enum EResult internal WorkshopFileType FileType; // m_eFileType enum EWorkshopFileType - internal uint CreatorAppID; // m_nCreatorAppID AppId_t - internal uint ConsumerAppID; // m_nConsumerAppID AppId_t + internal AppId CreatorAppID; // m_nCreatorAppID AppId_t + internal AppId ConsumerAppID; // m_nConsumerAppID AppId_t [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 129)] internal string Title; // m_rgchTitle char [129] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8000)] @@ -4549,8 +4549,8 @@ public struct Pack8 internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t internal Result Result; // m_eResult enum EResult internal WorkshopFileType FileType; // m_eFileType enum EWorkshopFileType - internal uint CreatorAppID; // m_nCreatorAppID AppId_t - internal uint ConsumerAppID; // m_nConsumerAppID AppId_t + internal AppId CreatorAppID; // m_nCreatorAppID AppId_t + internal AppId ConsumerAppID; // m_nConsumerAppID AppId_t [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 129)] internal string Title; // m_rgchTitle char [129] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 8000)] @@ -4745,7 +4745,7 @@ public struct Pack8 internal struct DownloadItemResult_t : Steamworks.ISteamCallback { - internal uint AppID; // m_unAppID AppId_t + internal AppId AppID; // m_unAppID AppId_t internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t internal Result Result; // m_eResult enum EResult @@ -4758,7 +4758,7 @@ internal struct DownloadItemResult_t : Steamworks.ISteamCallback [StructLayout( LayoutKind.Sequential, Pack = 4 )] public struct Pack4 { - internal uint AppID; // m_unAppID AppId_t + internal AppId AppID; // m_unAppID AppId_t internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t internal Result Result; // m_eResult enum EResult @@ -4768,7 +4768,7 @@ public struct Pack4 [StructLayout( LayoutKind.Sequential, Pack = 8 )] public struct Pack8 { - internal uint AppID; // m_unAppID AppId_t + internal AppId AppID; // m_unAppID AppId_t internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t internal Result Result; // m_eResult enum EResult @@ -5028,7 +5028,7 @@ internal struct AddAppDependencyResult_t : Steamworks.ISteamCallback { internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t #region ISteamCallback public int GetCallbackId() => CallbackIdentifiers.ClientUGC + 14; @@ -5041,7 +5041,7 @@ public struct Pack4 { internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator AddAppDependencyResult_t ( AddAppDependencyResult_t.Pack4 d ) => new AddAppDependencyResult_t{ Result = d.Result,PublishedFileId = d.PublishedFileId,AppID = d.AppID, }; } @@ -5051,7 +5051,7 @@ public struct Pack8 { internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator AddAppDependencyResult_t ( AddAppDependencyResult_t.Pack8 d ) => new AddAppDependencyResult_t{ Result = d.Result,PublishedFileId = d.PublishedFileId,AppID = d.AppID, }; } @@ -5062,7 +5062,7 @@ internal struct RemoveAppDependencyResult_t : Steamworks.ISteamCallback { internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t #region ISteamCallback public int GetCallbackId() => CallbackIdentifiers.ClientUGC + 15; @@ -5075,7 +5075,7 @@ public struct Pack4 { internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator RemoveAppDependencyResult_t ( RemoveAppDependencyResult_t.Pack4 d ) => new RemoveAppDependencyResult_t{ Result = d.Result,PublishedFileId = d.PublishedFileId,AppID = d.AppID, }; } @@ -5085,7 +5085,7 @@ public struct Pack8 { internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator RemoveAppDependencyResult_t ( RemoveAppDependencyResult_t.Pack8 d ) => new RemoveAppDependencyResult_t{ Result = d.Result,PublishedFileId = d.PublishedFileId,AppID = d.AppID, }; } @@ -5097,7 +5097,7 @@ internal struct GetAppDependenciesResult_t : Steamworks.ISteamCallback internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32, ArraySubType = UnmanagedType.U4)] - internal AppId_t[] GAppIDs; // m_rgAppIDs AppId_t [32] + internal AppId[] GAppIDs; // m_rgAppIDs AppId_t [32] internal uint NumAppDependencies; // m_nNumAppDependencies uint32 internal uint TotalNumAppDependencies; // m_nTotalNumAppDependencies uint32 @@ -5113,7 +5113,7 @@ public struct Pack4 internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32, ArraySubType = UnmanagedType.U4)] - internal AppId_t[] GAppIDs; // m_rgAppIDs AppId_t [32] + internal AppId[] GAppIDs; // m_rgAppIDs AppId_t [32] internal uint NumAppDependencies; // m_nNumAppDependencies uint32 internal uint TotalNumAppDependencies; // m_nTotalNumAppDependencies uint32 @@ -5126,7 +5126,7 @@ public struct Pack8 internal Result Result; // m_eResult enum EResult internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32, ArraySubType = UnmanagedType.U4)] - internal AppId_t[] GAppIDs; // m_rgAppIDs AppId_t [32] + internal AppId[] GAppIDs; // m_rgAppIDs AppId_t [32] internal uint NumAppDependencies; // m_nNumAppDependencies uint32 internal uint TotalNumAppDependencies; // m_nTotalNumAppDependencies uint32 @@ -5168,7 +5168,7 @@ public struct Pack8 internal struct SteamAppInstalled_t : Steamworks.ISteamCallback { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t #region ISteamCallback public int GetCallbackId() => CallbackIdentifiers.SteamAppList + 1; @@ -5179,7 +5179,7 @@ internal struct SteamAppInstalled_t : Steamworks.ISteamCallback [StructLayout( LayoutKind.Sequential, Pack = 4 )] public struct Pack4 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator SteamAppInstalled_t ( SteamAppInstalled_t.Pack4 d ) => new SteamAppInstalled_t{ AppID = d.AppID, }; } @@ -5187,7 +5187,7 @@ public struct Pack4 [StructLayout( LayoutKind.Sequential, Pack = 8 )] public struct Pack8 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator SteamAppInstalled_t ( SteamAppInstalled_t.Pack8 d ) => new SteamAppInstalled_t{ AppID = d.AppID, }; } @@ -5196,7 +5196,7 @@ public struct Pack8 internal struct SteamAppUninstalled_t : Steamworks.ISteamCallback { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t #region ISteamCallback public int GetCallbackId() => CallbackIdentifiers.SteamAppList + 2; @@ -5207,7 +5207,7 @@ internal struct SteamAppUninstalled_t : Steamworks.ISteamCallback [StructLayout( LayoutKind.Sequential, Pack = 4 )] public struct Pack4 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator SteamAppUninstalled_t ( SteamAppUninstalled_t.Pack4 d ) => new SteamAppUninstalled_t{ AppID = d.AppID, }; } @@ -5215,7 +5215,7 @@ public struct Pack4 [StructLayout( LayoutKind.Sequential, Pack = 8 )] public struct Pack8 { - internal uint AppID; // m_nAppID AppId_t + internal AppId AppID; // m_nAppID AppId_t public static implicit operator SteamAppUninstalled_t ( SteamAppUninstalled_t.Pack8 d ) => new SteamAppUninstalled_t{ AppID = d.AppID, }; } @@ -6298,7 +6298,7 @@ public struct Pack8 internal struct GetVideoURLResult_t : Steamworks.ISteamCallback { internal Result Result; // m_eResult enum EResult - internal uint VideoAppID; // m_unVideoAppID AppId_t + internal AppId VideoAppID; // m_unVideoAppID AppId_t [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] internal string URL; // m_rgchURL char [256] @@ -6312,7 +6312,7 @@ internal struct GetVideoURLResult_t : Steamworks.ISteamCallback public struct Pack4 { internal Result Result; // m_eResult enum EResult - internal uint VideoAppID; // m_unVideoAppID AppId_t + internal AppId VideoAppID; // m_unVideoAppID AppId_t [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] internal string URL; // m_rgchURL char [256] @@ -6323,7 +6323,7 @@ public struct Pack4 public struct Pack8 { internal Result Result; // m_eResult enum EResult - internal uint VideoAppID; // m_unVideoAppID AppId_t + internal AppId VideoAppID; // m_unVideoAppID AppId_t [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)] internal string URL; // m_rgchURL char [256] @@ -6335,7 +6335,7 @@ public struct Pack8 internal struct GetOPFSettingsResult_t : Steamworks.ISteamCallback { internal Result Result; // m_eResult enum EResult - internal uint VideoAppID; // m_unVideoAppID AppId_t + internal AppId VideoAppID; // m_unVideoAppID AppId_t #region ISteamCallback public int GetCallbackId() => CallbackIdentifiers.ClientVideo + 24; @@ -6347,7 +6347,7 @@ internal struct GetOPFSettingsResult_t : Steamworks.ISteamCallback public struct Pack4 { internal Result Result; // m_eResult enum EResult - internal uint VideoAppID; // m_unVideoAppID AppId_t + internal AppId VideoAppID; // m_unVideoAppID AppId_t public static implicit operator GetOPFSettingsResult_t ( GetOPFSettingsResult_t.Pack4 d ) => new GetOPFSettingsResult_t{ Result = d.Result,VideoAppID = d.VideoAppID, }; } @@ -6356,7 +6356,7 @@ public struct Pack4 public struct Pack8 { internal Result Result; // m_eResult enum EResult - internal uint VideoAppID; // m_unVideoAppID AppId_t + internal AppId VideoAppID; // m_unVideoAppID AppId_t public static implicit operator GetOPFSettingsResult_t ( GetOPFSettingsResult_t.Pack8 d ) => new GetOPFSettingsResult_t{ Result = d.Result,VideoAppID = d.VideoAppID, }; } @@ -6894,7 +6894,7 @@ public struct Pack8 internal struct ItemInstalled_t : Steamworks.ISteamCallback { - internal uint AppID; // m_unAppID AppId_t + internal AppId AppID; // m_unAppID AppId_t internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t #region ISteamCallback @@ -6906,7 +6906,7 @@ internal struct ItemInstalled_t : Steamworks.ISteamCallback [StructLayout( LayoutKind.Sequential, Pack = 4 )] public struct Pack4 { - internal uint AppID; // m_unAppID AppId_t + internal AppId AppID; // m_unAppID AppId_t internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t public static implicit operator ItemInstalled_t ( ItemInstalled_t.Pack4 d ) => new ItemInstalled_t{ AppID = d.AppID,PublishedFileId = d.PublishedFileId, }; @@ -6915,7 +6915,7 @@ public struct Pack4 [StructLayout( LayoutKind.Sequential, Pack = 8 )] public struct Pack8 { - internal uint AppID; // m_unAppID AppId_t + internal AppId AppID; // m_unAppID AppId_t internal PublishedFileId PublishedFileId; // m_nPublishedFileId PublishedFileId_t public static implicit operator ItemInstalled_t ( ItemInstalled_t.Pack8 d ) => new ItemInstalled_t{ AppID = d.AppID,PublishedFileId = d.PublishedFileId, }; diff --git a/Facepunch.Steamworks/Generated/SteamTypes.cs b/Facepunch.Steamworks/Generated/SteamTypes.cs index 7655512..eff3079 100644 --- a/Facepunch.Steamworks/Generated/SteamTypes.cs +++ b/Facepunch.Steamworks/Generated/SteamTypes.cs @@ -50,15 +50,6 @@ internal struct BundleId_t public override string ToString() => Value.ToString(); } - internal struct AppId_t - { - public uint Value; - - public static implicit operator AppId_t( uint value ) => new AppId_t(){ Value = value }; - public static implicit operator uint( AppId_t value ) => value.Value; - public override string ToString() => Value.ToString(); - } - internal struct AssetClassId_t { public ulong Value; diff --git a/Facepunch.Steamworks/SteamApps.cs b/Facepunch.Steamworks/SteamApps.cs index aef7fb9..f273c61 100644 --- a/Facepunch.Steamworks/SteamApps.cs +++ b/Facepunch.Steamworks/SteamApps.cs @@ -109,7 +109,7 @@ internal static void InstallEvents() /// public static IEnumerable DlcInformation() { - var appid = default( AppId_t ); + var appid = default( AppId ); var available = false; for ( int i = 0; i < Internal.GetDLCCount(); i++ ) diff --git a/Generator/Cleanup.cs b/Generator/Cleanup.cs index 3dcbb52..1fcd3e4 100644 --- a/Generator/Cleanup.cs +++ b/Generator/Cleanup.cs @@ -19,6 +19,7 @@ public static string ConvertType( string type ) type = type.Replace( "BeginAuthSessionResult", "BeginAuthResult" ); type = type.Replace( "PublishedFileId_t", "PublishedFileId" ); type = type.Replace( "PublishedFileId_t", "PublishedFileId" ); + type = type.Replace( "AppId_t", "AppId" ); type = type.Replace( "LeaderboardSortMethod", "LeaderboardSort" ); type = type.Replace( "LeaderboardDisplayType", "LeaderboardDisplay" ); type = type.Replace( "UGCMatchingUGCType", "UgcType" ); @@ -31,7 +32,7 @@ public static bool ShouldCreate( string type ) if ( type == "SteamId" ) return false; if ( type == "LeaderboardSort" ) return false; if ( type == "LeaderboardDisplay" ) return false; - + if ( type == "AppId" ) return false; return true; } diff --git a/Generator/CodeWriter/Struct.cs b/Generator/CodeWriter/Struct.cs index 905aecc..f3ea11c 100644 --- a/Generator/CodeWriter/Struct.cs +++ b/Generator/CodeWriter/Struct.cs @@ -229,10 +229,10 @@ private void StructFields( SteamApiDefinition.StructDef.StructFields[] fields ) t = "IntPtr"; } - if (t.StartsWith("AppId_t ") && t.Contains("[")) + if (t.StartsWith("AppId ") && t.Contains("[")) { - var num = t.Replace("AppId_t", "").Trim('[', ']', ' '); - t = $"AppId_t[]"; + var num = t.Replace("AppId", "").Trim('[', ']', ' '); + t = $"AppId[]"; WriteLine($"[MarshalAs(UnmanagedType.ByValArray, SizeConst = {num}, ArraySubType = UnmanagedType.U4)]"); } diff --git a/Generator/CodeWriter/Types.cs b/Generator/CodeWriter/Types.cs index a024e4f..ea46083 100644 --- a/Generator/CodeWriter/Types.cs +++ b/Generator/CodeWriter/Types.cs @@ -39,6 +39,9 @@ private void Types() { var typeName = Cleanup.ConvertType( o.Name ); + if ( !Cleanup.ShouldCreate( typeName ) ) + continue; + if ( SkipTypes.Contains( o.Name ) ) continue;