GitHub/Facepunch.Steamworks
2
0
Fork 0
mirror of https://github.com/Facepunch/Facepunch.Steamworks.git synced 2024-12-25 14:15:47 +03:00
Code Issues Projects Releases Wiki Activity

Expose ItemId, DefId types

Browse Source
This commit is contained in:
Garry Newman 2019-04-29 10:41:40 +01:00
parent d2ce2fe13b
commit 67de9c8e96
5 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
Facepunch.Steamworks/Generated/Interfaces/ISteamInventory.cs
View File

@ -140,11 +140,11 @@ internal bool GetAllItems( ref SteamInventoryResult_t pResultHandle )
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FGetItemsByID( IntPtr self, ref SteamInventoryResult_t pResultHandle, ref SteamItemInstanceID_t pInstanceIDs, uint unCountInstanceIDs ); private delegate bool FGetItemsByID( IntPtr self, ref SteamInventoryResult_t pResultHandle, ref InventoryItemId pInstanceIDs, uint unCountInstanceIDs );
private FGetItemsByID _GetItemsByID; private FGetItemsByID _GetItemsByID;
#endregion #endregion
internal bool GetItemsByID( ref SteamInventoryResult_t pResultHandle, ref SteamItemInstanceID_t pInstanceIDs, uint unCountInstanceIDs ) internal bool GetItemsByID( ref SteamInventoryResult_t pResultHandle, ref InventoryItemId pInstanceIDs, uint unCountInstanceIDs )
{ {
return _GetItemsByID( Self, ref pResultHandle, ref pInstanceIDs, unCountInstanceIDs ); return _GetItemsByID( Self, ref pResultHandle, ref pInstanceIDs, unCountInstanceIDs );
} }
@ -176,11 +176,11 @@ internal bool DeserializeResult( [In,Out] SteamInventoryResult_t[] pOutResultHa
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FGenerateItems( IntPtr self, ref SteamInventoryResult_t pResultHandle, [In,Out] SteamItemDef_t[] pArrayItemDefs, [In,Out] uint[] punArrayQuantity, uint unArrayLength ); private delegate bool FGenerateItems( IntPtr self, ref SteamInventoryResult_t pResultHandle, [In,Out] InventoryDefId[] pArrayItemDefs, [In,Out] uint[] punArrayQuantity, uint unArrayLength );
private FGenerateItems _GenerateItems; private FGenerateItems _GenerateItems;
#endregion #endregion
internal bool GenerateItems( ref SteamInventoryResult_t pResultHandle, [In,Out] SteamItemDef_t[] pArrayItemDefs, [In,Out] uint[] punArrayQuantity, uint unArrayLength ) internal bool GenerateItems( ref SteamInventoryResult_t pResultHandle, [In,Out] InventoryDefId[] pArrayItemDefs, [In,Out] uint[] punArrayQuantity, uint unArrayLength )
{ {
return _GenerateItems( Self, ref pResultHandle, pArrayItemDefs, punArrayQuantity, unArrayLength ); return _GenerateItems( Self, ref pResultHandle, pArrayItemDefs, punArrayQuantity, unArrayLength );
} }
@ -200,11 +200,11 @@ internal bool GrantPromoItems( ref SteamInventoryResult_t pResultHandle )
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FAddPromoItem( IntPtr self, ref SteamInventoryResult_t pResultHandle, SteamItemDef_t itemDef ); private delegate bool FAddPromoItem( IntPtr self, ref SteamInventoryResult_t pResultHandle, InventoryDefId itemDef );
private FAddPromoItem _AddPromoItem; private FAddPromoItem _AddPromoItem;
#endregion #endregion
internal bool AddPromoItem( ref SteamInventoryResult_t pResultHandle, SteamItemDef_t itemDef ) internal bool AddPromoItem( ref SteamInventoryResult_t pResultHandle, InventoryDefId itemDef )
{ {
return _AddPromoItem( Self, ref pResultHandle, itemDef ); return _AddPromoItem( Self, ref pResultHandle, itemDef );
} }
@ -212,11 +212,11 @@ internal bool AddPromoItem( ref SteamInventoryResult_t pResultHandle, SteamItemD
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FAddPromoItems( IntPtr self, ref SteamInventoryResult_t pResultHandle, [In,Out] SteamItemDef_t[] pArrayItemDefs, uint unArrayLength ); private delegate bool FAddPromoItems( IntPtr self, ref SteamInventoryResult_t pResultHandle, [In,Out] InventoryDefId[] pArrayItemDefs, uint unArrayLength );
private FAddPromoItems _AddPromoItems; private FAddPromoItems _AddPromoItems;
#endregion #endregion
internal bool AddPromoItems( ref SteamInventoryResult_t pResultHandle, [In,Out] SteamItemDef_t[] pArrayItemDefs, uint unArrayLength ) internal bool AddPromoItems( ref SteamInventoryResult_t pResultHandle, [In,Out] InventoryDefId[] pArrayItemDefs, uint unArrayLength )
{ {
return _AddPromoItems( Self, ref pResultHandle, pArrayItemDefs, unArrayLength ); return _AddPromoItems( Self, ref pResultHandle, pArrayItemDefs, unArrayLength );
} }
@ -224,11 +224,11 @@ internal bool AddPromoItems( ref SteamInventoryResult_t pResultHandle, [In,Out]
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FConsumeItem( IntPtr self, ref SteamInventoryResult_t pResultHandle, SteamItemInstanceID_t itemConsume, uint unQuantity ); private delegate bool FConsumeItem( IntPtr self, ref SteamInventoryResult_t pResultHandle, InventoryItemId itemConsume, uint unQuantity );
private FConsumeItem _ConsumeItem; private FConsumeItem _ConsumeItem;
#endregion #endregion
internal bool ConsumeItem( ref SteamInventoryResult_t pResultHandle, SteamItemInstanceID_t itemConsume, uint unQuantity ) internal bool ConsumeItem( ref SteamInventoryResult_t pResultHandle, InventoryItemId itemConsume, uint unQuantity )
{ {
return _ConsumeItem( Self, ref pResultHandle, itemConsume, unQuantity ); return _ConsumeItem( Self, ref pResultHandle, itemConsume, unQuantity );
} }
@ -236,11 +236,11 @@ internal bool ConsumeItem( ref SteamInventoryResult_t pResultHandle, SteamItemIn
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FExchangeItems( IntPtr self, ref SteamInventoryResult_t pResultHandle, ref SteamItemDef_t pArrayGenerate, ref uint punArrayGenerateQuantity, uint unArrayGenerateLength, ref SteamItemInstanceID_t pArrayDestroy, ref uint punArrayDestroyQuantity, uint unArrayDestroyLength ); private delegate bool FExchangeItems( IntPtr self, ref SteamInventoryResult_t pResultHandle, ref InventoryDefId pArrayGenerate, ref uint punArrayGenerateQuantity, uint unArrayGenerateLength, ref InventoryItemId pArrayDestroy, ref uint punArrayDestroyQuantity, uint unArrayDestroyLength );
private FExchangeItems _ExchangeItems; private FExchangeItems _ExchangeItems;
#endregion #endregion
internal bool ExchangeItems( ref SteamInventoryResult_t pResultHandle, ref SteamItemDef_t pArrayGenerate, ref uint punArrayGenerateQuantity, uint unArrayGenerateLength, ref SteamItemInstanceID_t pArrayDestroy, ref uint punArrayDestroyQuantity, uint unArrayDestroyLength ) internal bool ExchangeItems( ref SteamInventoryResult_t pResultHandle, ref InventoryDefId pArrayGenerate, ref uint punArrayGenerateQuantity, uint unArrayGenerateLength, ref InventoryItemId pArrayDestroy, ref uint punArrayDestroyQuantity, uint unArrayDestroyLength )
{ {
return _ExchangeItems( Self, ref pResultHandle, ref pArrayGenerate, ref punArrayGenerateQuantity, unArrayGenerateLength, ref pArrayDestroy, ref punArrayDestroyQuantity, unArrayDestroyLength ); return _ExchangeItems( Self, ref pResultHandle, ref pArrayGenerate, ref punArrayGenerateQuantity, unArrayGenerateLength, ref pArrayDestroy, ref punArrayDestroyQuantity, unArrayDestroyLength );
} }
@ -248,11 +248,11 @@ internal bool ExchangeItems( ref SteamInventoryResult_t pResultHandle, ref Steam
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FTransferItemQuantity( IntPtr self, ref SteamInventoryResult_t pResultHandle, SteamItemInstanceID_t itemIdSource, uint unQuantity, SteamItemInstanceID_t itemIdDest ); private delegate bool FTransferItemQuantity( IntPtr self, ref SteamInventoryResult_t pResultHandle, InventoryItemId itemIdSource, uint unQuantity, InventoryItemId itemIdDest );
private FTransferItemQuantity _TransferItemQuantity; private FTransferItemQuantity _TransferItemQuantity;
#endregion #endregion
internal bool TransferItemQuantity( ref SteamInventoryResult_t pResultHandle, SteamItemInstanceID_t itemIdSource, uint unQuantity, SteamItemInstanceID_t itemIdDest ) internal bool TransferItemQuantity( ref SteamInventoryResult_t pResultHandle, InventoryItemId itemIdSource, uint unQuantity, InventoryItemId itemIdDest )
{ {
return _TransferItemQuantity( Self, ref pResultHandle, itemIdSource, unQuantity, itemIdDest ); return _TransferItemQuantity( Self, ref pResultHandle, itemIdSource, unQuantity, itemIdDest );
} }
@ -271,11 +271,11 @@ internal void SendItemDropHeartbeat()
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FTriggerItemDrop( IntPtr self, ref SteamInventoryResult_t pResultHandle, SteamItemDef_t dropListDefinition ); private delegate bool FTriggerItemDrop( IntPtr self, ref SteamInventoryResult_t pResultHandle, InventoryDefId dropListDefinition );
private FTriggerItemDrop _TriggerItemDrop; private FTriggerItemDrop _TriggerItemDrop;
#endregion #endregion
internal bool TriggerItemDrop( ref SteamInventoryResult_t pResultHandle, SteamItemDef_t dropListDefinition ) internal bool TriggerItemDrop( ref SteamInventoryResult_t pResultHandle, InventoryDefId dropListDefinition )
{ {
return _TriggerItemDrop( Self, ref pResultHandle, dropListDefinition ); return _TriggerItemDrop( Self, ref pResultHandle, dropListDefinition );
} }
@ -283,11 +283,11 @@ internal bool TriggerItemDrop( ref SteamInventoryResult_t pResultHandle, SteamIt
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FTradeItems( IntPtr self, ref SteamInventoryResult_t pResultHandle, SteamId steamIDTradePartner, ref SteamItemInstanceID_t pArrayGive, ref uint pArrayGiveQuantity, uint nArrayGiveLength, ref SteamItemInstanceID_t pArrayGet, ref uint pArrayGetQuantity, uint nArrayGetLength ); private delegate bool FTradeItems( IntPtr self, ref SteamInventoryResult_t pResultHandle, SteamId steamIDTradePartner, ref InventoryItemId pArrayGive, ref uint pArrayGiveQuantity, uint nArrayGiveLength, ref InventoryItemId pArrayGet, ref uint pArrayGetQuantity, uint nArrayGetLength );
private FTradeItems _TradeItems; private FTradeItems _TradeItems;
#endregion #endregion
internal bool TradeItems( ref SteamInventoryResult_t pResultHandle, SteamId steamIDTradePartner, ref SteamItemInstanceID_t pArrayGive, ref uint pArrayGiveQuantity, uint nArrayGiveLength, ref SteamItemInstanceID_t pArrayGet, ref uint pArrayGetQuantity, uint nArrayGetLength ) internal bool TradeItems( ref SteamInventoryResult_t pResultHandle, SteamId steamIDTradePartner, ref InventoryItemId pArrayGive, ref uint pArrayGiveQuantity, uint nArrayGiveLength, ref InventoryItemId pArrayGet, ref uint pArrayGetQuantity, uint nArrayGetLength )
{ {
return _TradeItems( Self, ref pResultHandle, steamIDTradePartner, ref pArrayGive, ref pArrayGiveQuantity, nArrayGiveLength, ref pArrayGet, ref pArrayGetQuantity, nArrayGetLength ); return _TradeItems( Self, ref pResultHandle, steamIDTradePartner, ref pArrayGive, ref pArrayGiveQuantity, nArrayGiveLength, ref pArrayGet, ref pArrayGetQuantity, nArrayGetLength );
} }
@ -307,11 +307,11 @@ internal bool LoadItemDefinitions()
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FGetItemDefinitionIDs( IntPtr self, [In,Out] SteamItemDef_t[] pItemDefIDs, ref uint punItemDefIDsArraySize ); private delegate bool FGetItemDefinitionIDs( IntPtr self, [In,Out] InventoryDefId[] pItemDefIDs, ref uint punItemDefIDsArraySize );
private FGetItemDefinitionIDs _GetItemDefinitionIDs; private FGetItemDefinitionIDs _GetItemDefinitionIDs;
#endregion #endregion
internal bool GetItemDefinitionIDs( [In,Out] SteamItemDef_t[] pItemDefIDs, ref uint punItemDefIDsArraySize ) internal bool GetItemDefinitionIDs( [In,Out] InventoryDefId[] pItemDefIDs, ref uint punItemDefIDsArraySize )
{ {
return _GetItemDefinitionIDs( Self, pItemDefIDs, ref punItemDefIDsArraySize ); return _GetItemDefinitionIDs( Self, pItemDefIDs, ref punItemDefIDsArraySize );
} }
@ -319,11 +319,11 @@ internal bool GetItemDefinitionIDs( [In,Out] SteamItemDef_t[] pItemDefIDs, ref
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FGetItemDefinitionProperty( IntPtr self, SteamItemDef_t iDefinition, string pchPropertyName, StringBuilder pchValueBuffer, ref uint punValueBufferSizeOut ); private delegate bool FGetItemDefinitionProperty( IntPtr self, InventoryDefId iDefinition, string pchPropertyName, StringBuilder pchValueBuffer, ref uint punValueBufferSizeOut );
private FGetItemDefinitionProperty _GetItemDefinitionProperty; private FGetItemDefinitionProperty _GetItemDefinitionProperty;
#endregion #endregion
internal bool GetItemDefinitionProperty( SteamItemDef_t iDefinition, string pchPropertyName, StringBuilder pchValueBuffer, ref uint punValueBufferSizeOut ) internal bool GetItemDefinitionProperty( InventoryDefId iDefinition, string pchPropertyName, StringBuilder pchValueBuffer, ref uint punValueBufferSizeOut )
{ {
return _GetItemDefinitionProperty( Self, iDefinition, pchPropertyName, pchValueBuffer, ref punValueBufferSizeOut ); return _GetItemDefinitionProperty( Self, iDefinition, pchPropertyName, pchValueBuffer, ref punValueBufferSizeOut );
} }
@ -342,22 +342,22 @@ internal bool GetItemDefinitionProperty( SteamItemDef_t iDefinition, string pchP
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FGetEligiblePromoItemDefinitionIDs( IntPtr self, SteamId steamID, [In,Out] SteamItemDef_t[] pItemDefIDs, ref uint punItemDefIDsArraySize ); private delegate bool FGetEligiblePromoItemDefinitionIDs( IntPtr self, SteamId steamID, [In,Out] InventoryDefId[] pItemDefIDs, ref uint punItemDefIDsArraySize );
private FGetEligiblePromoItemDefinitionIDs _GetEligiblePromoItemDefinitionIDs; private FGetEligiblePromoItemDefinitionIDs _GetEligiblePromoItemDefinitionIDs;
#endregion #endregion
internal bool GetEligiblePromoItemDefinitionIDs( SteamId steamID, [In,Out] SteamItemDef_t[] pItemDefIDs, ref uint punItemDefIDsArraySize ) internal bool GetEligiblePromoItemDefinitionIDs( SteamId steamID, [In,Out] InventoryDefId[] pItemDefIDs, ref uint punItemDefIDsArraySize )
{ {
return _GetEligiblePromoItemDefinitionIDs( Self, steamID, pItemDefIDs, ref punItemDefIDsArraySize ); return _GetEligiblePromoItemDefinitionIDs( Self, steamID, pItemDefIDs, ref punItemDefIDsArraySize );
} }
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
private delegate SteamAPICall_t FStartPurchase( IntPtr self, [In,Out] SteamItemDef_t[] pArrayItemDefs, [In,Out] uint[] punArrayQuantity, uint unArrayLength ); private delegate SteamAPICall_t FStartPurchase( IntPtr self, [In,Out] InventoryDefId[] pArrayItemDefs, [In,Out] uint[] punArrayQuantity, uint unArrayLength );
private FStartPurchase _StartPurchase; private FStartPurchase _StartPurchase;
#endregion #endregion
internal async Task<SteamInventoryStartPurchaseResult_t?> StartPurchase( [In,Out] SteamItemDef_t[] pArrayItemDefs, [In,Out] uint[] punArrayQuantity, uint unArrayLength ) internal async Task<SteamInventoryStartPurchaseResult_t?> StartPurchase( [In,Out] InventoryDefId[] pArrayItemDefs, [In,Out] uint[] punArrayQuantity, uint unArrayLength )
{ {
return await (new Result<SteamInventoryStartPurchaseResult_t>( _StartPurchase( Self, pArrayItemDefs, punArrayQuantity, unArrayLength ) )).GetResult(); return await (new Result<SteamInventoryStartPurchaseResult_t>( _StartPurchase( Self, pArrayItemDefs, punArrayQuantity, unArrayLength ) )).GetResult();
} }
@ -387,11 +387,11 @@ internal uint GetNumItemsWithPrices()
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FGetItemsWithPrices( IntPtr self, [In,Out] SteamItemDef_t[] pArrayItemDefs, [In,Out] ulong[] pCurrentPrices, [In,Out] ulong[] pBasePrices, uint unArrayLength ); private delegate bool FGetItemsWithPrices( IntPtr self, [In,Out] InventoryDefId[] pArrayItemDefs, [In,Out] ulong[] pCurrentPrices, [In,Out] ulong[] pBasePrices, uint unArrayLength );
private FGetItemsWithPrices _GetItemsWithPrices; private FGetItemsWithPrices _GetItemsWithPrices;
#endregion #endregion
internal bool GetItemsWithPrices( [In,Out] SteamItemDef_t[] pArrayItemDefs, [In,Out] ulong[] pCurrentPrices, [In,Out] ulong[] pBasePrices, uint unArrayLength ) internal bool GetItemsWithPrices( [In,Out] InventoryDefId[] pArrayItemDefs, [In,Out] ulong[] pCurrentPrices, [In,Out] ulong[] pBasePrices, uint unArrayLength )
{ {
return _GetItemsWithPrices( Self, pArrayItemDefs, pCurrentPrices, pBasePrices, unArrayLength ); return _GetItemsWithPrices( Self, pArrayItemDefs, pCurrentPrices, pBasePrices, unArrayLength );
} }
@ -399,11 +399,11 @@ internal bool GetItemsWithPrices( [In,Out] SteamItemDef_t[] pArrayItemDefs, [In
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FGetItemPrice( IntPtr self, SteamItemDef_t iDefinition, ref ulong pCurrentPrice, ref ulong pBasePrice ); private delegate bool FGetItemPrice( IntPtr self, InventoryDefId iDefinition, ref ulong pCurrentPrice, ref ulong pBasePrice );
private FGetItemPrice _GetItemPrice; private FGetItemPrice _GetItemPrice;
#endregion #endregion
internal bool GetItemPrice( SteamItemDef_t iDefinition, ref ulong pCurrentPrice, ref ulong pBasePrice ) internal bool GetItemPrice( InventoryDefId iDefinition, ref ulong pCurrentPrice, ref ulong pBasePrice )
{ {
return _GetItemPrice( Self, iDefinition, ref pCurrentPrice, ref pBasePrice ); return _GetItemPrice( Self, iDefinition, ref pCurrentPrice, ref pBasePrice );
} }
@ -422,11 +422,11 @@ internal SteamInventoryUpdateHandle_t StartUpdateProperties()
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FRemoveProperty( IntPtr self, SteamInventoryUpdateHandle_t handle, SteamItemInstanceID_t nItemID, string pchPropertyName ); private delegate bool FRemoveProperty( IntPtr self, SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, string pchPropertyName );
private FRemoveProperty _RemoveProperty; private FRemoveProperty _RemoveProperty;
#endregion #endregion
internal bool RemoveProperty( SteamInventoryUpdateHandle_t handle, SteamItemInstanceID_t nItemID, string pchPropertyName ) internal bool RemoveProperty( SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, string pchPropertyName )
{ {
return _RemoveProperty( Self, handle, nItemID, pchPropertyName ); return _RemoveProperty( Self, handle, nItemID, pchPropertyName );
} }
@ -434,11 +434,11 @@ internal bool RemoveProperty( SteamInventoryUpdateHandle_t handle, SteamItemInst
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FSetProperty1( IntPtr self, SteamInventoryUpdateHandle_t handle, SteamItemInstanceID_t nItemID, string pchPropertyName, string pchPropertyValue ); private delegate bool FSetProperty1( IntPtr self, SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, string pchPropertyName, string pchPropertyValue );
private FSetProperty1 _SetProperty1; private FSetProperty1 _SetProperty1;
#endregion #endregion
internal bool SetProperty1( SteamInventoryUpdateHandle_t handle, SteamItemInstanceID_t nItemID, string pchPropertyName, string pchPropertyValue ) internal bool SetProperty1( SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, string pchPropertyName, string pchPropertyValue )
{ {
return _SetProperty1( Self, handle, nItemID, pchPropertyName, pchPropertyValue ); return _SetProperty1( Self, handle, nItemID, pchPropertyName, pchPropertyValue );
} }
@ -446,11 +446,11 @@ internal bool SetProperty1( SteamInventoryUpdateHandle_t handle, SteamItemInstan
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FSetProperty2( IntPtr self, SteamInventoryUpdateHandle_t handle, SteamItemInstanceID_t nItemID, string pchPropertyName, [MarshalAs( UnmanagedType.U1 )] bool bValue ); private delegate bool FSetProperty2( IntPtr self, SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, string pchPropertyName, [MarshalAs( UnmanagedType.U1 )] bool bValue );
private FSetProperty2 _SetProperty2; private FSetProperty2 _SetProperty2;
#endregion #endregion
internal bool SetProperty2( SteamInventoryUpdateHandle_t handle, SteamItemInstanceID_t nItemID, string pchPropertyName, [MarshalAs( UnmanagedType.U1 )] bool bValue ) internal bool SetProperty2( SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, string pchPropertyName, [MarshalAs( UnmanagedType.U1 )] bool bValue )
{ {
return _SetProperty2( Self, handle, nItemID, pchPropertyName, bValue ); return _SetProperty2( Self, handle, nItemID, pchPropertyName, bValue );
} }
@ -458,11 +458,11 @@ internal bool SetProperty2( SteamInventoryUpdateHandle_t handle, SteamItemInstan
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FSetProperty3( IntPtr self, SteamInventoryUpdateHandle_t handle, SteamItemInstanceID_t nItemID, string pchPropertyName, long nValue ); private delegate bool FSetProperty3( IntPtr self, SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, string pchPropertyName, long nValue );
private FSetProperty3 _SetProperty3; private FSetProperty3 _SetProperty3;
#endregion #endregion
internal bool SetProperty3( SteamInventoryUpdateHandle_t handle, SteamItemInstanceID_t nItemID, string pchPropertyName, long nValue ) internal bool SetProperty3( SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, string pchPropertyName, long nValue )
{ {
return _SetProperty3( Self, handle, nItemID, pchPropertyName, nValue ); return _SetProperty3( Self, handle, nItemID, pchPropertyName, nValue );
} }
@ -470,11 +470,11 @@ internal bool SetProperty3( SteamInventoryUpdateHandle_t handle, SteamItemInstan
#region FunctionMeta #region FunctionMeta
[UnmanagedFunctionPointer( CallingConvention.ThisCall )] [UnmanagedFunctionPointer( CallingConvention.ThisCall )]
[return: MarshalAs( UnmanagedType.I1 )] [return: MarshalAs( UnmanagedType.I1 )]
private delegate bool FSetProperty4( IntPtr self, SteamInventoryUpdateHandle_t handle, SteamItemInstanceID_t nItemID, string pchPropertyName, float flValue ); private delegate bool FSetProperty4( IntPtr self, SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, string pchPropertyName, float flValue );
private FSetProperty4 _SetProperty4; private FSetProperty4 _SetProperty4;
#endregion #endregion
internal bool SetProperty4( SteamInventoryUpdateHandle_t handle, SteamItemInstanceID_t nItemID, string pchPropertyName, float flValue ) internal bool SetProperty4( SteamInventoryUpdateHandle_t handle, InventoryItemId nItemID, string pchPropertyName, float flValue )
{ {
return _SetProperty4( Self, handle, nItemID, pchPropertyName, flValue ); return _SetProperty4( Self, handle, nItemID, pchPropertyName, flValue );
} }

12
Facepunch.Steamworks/Generated/SteamStructs.cs
View File

@ -6066,8 +6066,8 @@ public struct Pack8
internal struct SteamItemDetails_t internal struct SteamItemDetails_t
{ {
internal ulong ItemId; // m_itemId SteamItemInstanceID_t internal InventoryItemId ItemId; // m_itemId SteamItemInstanceID_t
internal int Definition; // m_iDefinition SteamItemDef_t internal InventoryDefId Definition; // m_iDefinition SteamItemDef_t
internal ushort Quantity; // m_unQuantity uint16 internal ushort Quantity; // m_unQuantity uint16
internal ushort Flags; // m_unFlags uint16 internal ushort Flags; // m_unFlags uint16
@ -6079,8 +6079,8 @@ internal struct SteamItemDetails_t
[StructLayout( LayoutKind.Sequential, Pack = 4 )] [StructLayout( LayoutKind.Sequential, Pack = 4 )]
public struct Pack4 public struct Pack4
{ {
internal ulong ItemId; // m_itemId SteamItemInstanceID_t internal InventoryItemId ItemId; // m_itemId SteamItemInstanceID_t
internal int Definition; // m_iDefinition SteamItemDef_t internal InventoryDefId Definition; // m_iDefinition SteamItemDef_t
internal ushort Quantity; // m_unQuantity uint16 internal ushort Quantity; // m_unQuantity uint16
internal ushort Flags; // m_unFlags uint16 internal ushort Flags; // m_unFlags uint16
@ -6090,8 +6090,8 @@ public struct Pack4
[StructLayout( LayoutKind.Sequential, Pack = 8 )] [StructLayout( LayoutKind.Sequential, Pack = 8 )]
public struct Pack8 public struct Pack8
{ {
internal ulong ItemId; // m_itemId SteamItemInstanceID_t internal InventoryItemId ItemId; // m_itemId SteamItemInstanceID_t
internal int Definition; // m_iDefinition SteamItemDef_t internal InventoryDefId Definition; // m_iDefinition SteamItemDef_t
internal ushort Quantity; // m_unQuantity uint16 internal ushort Quantity; // m_unQuantity uint16
internal ushort Flags; // m_unFlags uint16 internal ushort Flags; // m_unFlags uint16

12
Facepunch.Steamworks/Generated/SteamTypes.cs
View File

@ -410,21 +410,21 @@ internal struct HHTMLBrowser
public override string ToString() => Value.ToString(); public override string ToString() => Value.ToString();
} }
internal struct SteamItemInstanceID_t public struct InventoryItemId
{ {
public ulong Value; public ulong Value;
public static implicit operator SteamItemInstanceID_t( ulong value ) => new SteamItemInstanceID_t(){ Value = value }; public static implicit operator InventoryItemId( ulong value ) => new InventoryItemId(){ Value = value };
public static implicit operator ulong( SteamItemInstanceID_t value ) => value.Value; public static implicit operator ulong( InventoryItemId value ) => value.Value;
public override string ToString() => Value.ToString(); public override string ToString() => Value.ToString();
} }
internal struct SteamItemDef_t public struct InventoryDefId
{ {
public int Value; public int Value;
public static implicit operator SteamItemDef_t( int value ) => new SteamItemDef_t(){ Value = value }; public static implicit operator InventoryDefId( int value ) => new InventoryDefId(){ Value = value };
public static implicit operator int( SteamItemDef_t value ) => value.Value; public static implicit operator int( InventoryDefId value ) => value.Value;
public override string ToString() => Value.ToString(); public override string ToString() => Value.ToString();
} }

4
Generator/Cleanup.cs
View File

@ -23,6 +23,8 @@ public static string ConvertType( string type )
type = type.Replace( "LeaderboardSortMethod", "LeaderboardSort" ); type = type.Replace( "LeaderboardSortMethod", "LeaderboardSort" );
type = type.Replace( "LeaderboardDisplayType", "LeaderboardDisplay" ); type = type.Replace( "LeaderboardDisplayType", "LeaderboardDisplay" );
type = type.Replace( "UGCMatchingUGCType", "UgcType" ); type = type.Replace( "UGCMatchingUGCType", "UgcType" );
type = type.Replace( "SteamItemInstanceID_t", "InventoryItemId" );
type = type.Replace( "SteamItemDef_t", "InventoryDefId" );
return type; return type;
} }
@ -54,6 +56,8 @@ internal static string Expose( string name )
if ( name == "PublishedFileId" ) return "public"; if ( name == "PublishedFileId" ) return "public";
if ( name == "Result" ) return "public"; if ( name == "Result" ) return "public";
if ( name == "UgcType" ) return "public"; if ( name == "UgcType" ) return "public";
if ( name == "InventoryItemId" ) return "public";
if ( name == "InventoryDefId" ) return "public";
return "internal"; return "internal";
} }

2
Generator/CodeWriter/Types/BaseType.cs
View File

@ -40,6 +40,8 @@ public static BaseType Parse( string type, string varname = null )
if ( basicType == "bool" ) return new BoolType { NativeType = type, VarName = varname }; if ( basicType == "bool" ) return new BoolType { NativeType = type, VarName = varname };
if ( basicType.EndsWith( "_t" ) ) return new StructType { NativeType = type, VarName = varname, StructName = basicType }; if ( basicType.EndsWith( "_t" ) ) return new StructType { NativeType = type, VarName = varname, StructName = basicType };
if ( basicType == "InventoryItemId" ) return new StructType { NativeType = type, VarName = varname, StructName = basicType };
if ( basicType == "InventoryDefId" ) return new StructType { NativeType = type, VarName = varname, StructName = basicType };
if ( basicType.StartsWith( "E" ) && char.IsUpper( basicType[1] ) ) return new EnumType { NativeType = type.Substring( 1 ), VarName = varname }; if ( basicType.StartsWith( "E" ) && char.IsUpper( basicType[1] ) ) return new EnumType { NativeType = type.Substring( 1 ), VarName = varname };
return new BaseType { NativeType = type, VarName = varname }; return new BaseType { NativeType = type, VarName = varname };