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

fixed "Result Esult"

Browse Source
This commit is contained in:
Garry Newman 2018-01-31 12:50:13 +00:00
parent ba6132715c
commit c8e5c0ca5a
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Facepunch.Steamworks/Interfaces/Inventory.Result.cs
View File

@ -153,7 +153,7 @@ internal void Fill()
internal void OnSteamResult( SteamInventoryResultReady_t data, bool error ) internal void OnSteamResult( SteamInventoryResultReady_t data, bool error )
{ {
var success = data.Esult == SteamNative.Result.OK && !error; var success = data.Result == SteamNative.Result.OK && !error;
if ( success ) if ( success )
{ {

30
Facepunch.Steamworks/SteamNative/SteamNative.Structs.cs
View File

@ -4939,7 +4939,7 @@ internal struct SetPersonaNameResponse_t
public bool Success; // m_bSuccess _Bool public bool Success; // m_bSuccess _Bool
[MarshalAs(UnmanagedType.I1)] [MarshalAs(UnmanagedType.I1)]
public bool LocalSuccess; // m_bLocalSuccess _Bool public bool LocalSuccess; // m_bLocalSuccess _Bool
public Result Esult; // m_result enum EResult public Result Result; // m_result enum EResult
// //
// Read this struct from a pointer, usually from Native. It will automatically do the awesome stuff. // Read this struct from a pointer, usually from Native. It will automatically do the awesome stuff.
@ -4957,7 +4957,7 @@ internal struct PackSmall
public bool Success; // m_bSuccess _Bool public bool Success; // m_bSuccess _Bool
[MarshalAs(UnmanagedType.I1)] [MarshalAs(UnmanagedType.I1)]
public bool LocalSuccess; // m_bLocalSuccess _Bool public bool LocalSuccess; // m_bLocalSuccess _Bool
public Result Esult; // m_result enum EResult public Result Result; // m_result enum EResult
// //
// Easily convert from PackSmall to SetPersonaNameResponse_t // Easily convert from PackSmall to SetPersonaNameResponse_t
@ -4968,7 +4968,7 @@ public static implicit operator SetPersonaNameResponse_t ( SetPersonaNameRespon
{ {
Success = d.Success, Success = d.Success,
LocalSuccess = d.LocalSuccess, LocalSuccess = d.LocalSuccess,
Esult = d.Esult, Result = d.Result,
}; };
} }
} }
@ -29015,7 +29015,7 @@ internal struct SteamInventoryResultReady_t
{ {
public const int CallbackId = CallbackIdentifiers.ClientInventory + 0; public const int CallbackId = CallbackIdentifiers.ClientInventory + 0;
public int Handle; // m_handle SteamInventoryResult_t public int Handle; // m_handle SteamInventoryResult_t
public Result Esult; // m_result enum EResult public Result Result; // m_result enum EResult
// //
// Read this struct from a pointer, usually from Native. It will automatically do the awesome stuff. // Read this struct from a pointer, usually from Native. It will automatically do the awesome stuff.
@ -29030,7 +29030,7 @@ public static SteamInventoryResultReady_t FromPointer( IntPtr p )
internal struct PackSmall internal struct PackSmall
{ {
public int Handle; // m_handle SteamInventoryResult_t public int Handle; // m_handle SteamInventoryResult_t
public Result Esult; // m_result enum EResult public Result Result; // m_result enum EResult
// //
// Easily convert from PackSmall to SteamInventoryResultReady_t // Easily convert from PackSmall to SteamInventoryResultReady_t
@ -29040,7 +29040,7 @@ public static implicit operator SteamInventoryResultReady_t ( SteamInventoryRes
return new SteamInventoryResultReady_t() return new SteamInventoryResultReady_t()
{ {
Handle = d.Handle, Handle = d.Handle,
Esult = d.Esult, Result = d.Result,
}; };
} }
} }
@ -29307,7 +29307,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
internal struct SteamInventoryEligiblePromoItemDefIDs_t internal struct SteamInventoryEligiblePromoItemDefIDs_t
{ {
public const int CallbackId = CallbackIdentifiers.ClientInventory + 3; public const int CallbackId = CallbackIdentifiers.ClientInventory + 3;
public Result Esult; // m_result enum EResult public Result Result; // m_result enum EResult
public ulong SteamID; // m_steamID class CSteamID public ulong SteamID; // m_steamID class CSteamID
public int UmEligiblePromoItemDefs; // m_numEligiblePromoItemDefs int public int UmEligiblePromoItemDefs; // m_numEligiblePromoItemDefs int
[MarshalAs(UnmanagedType.I1)] [MarshalAs(UnmanagedType.I1)]
@ -29325,7 +29325,7 @@ public static SteamInventoryEligiblePromoItemDefIDs_t FromPointer( IntPtr p )
[StructLayout( LayoutKind.Sequential, Pack = 4 )] [StructLayout( LayoutKind.Sequential, Pack = 4 )]
internal struct PackSmall internal struct PackSmall
{ {
public Result Esult; // m_result enum EResult public Result Result; // m_result enum EResult
public ulong SteamID; // m_steamID class CSteamID public ulong SteamID; // m_steamID class CSteamID
public int UmEligiblePromoItemDefs; // m_numEligiblePromoItemDefs int public int UmEligiblePromoItemDefs; // m_numEligiblePromoItemDefs int
[MarshalAs(UnmanagedType.I1)] [MarshalAs(UnmanagedType.I1)]
@ -29338,7 +29338,7 @@ public static implicit operator SteamInventoryEligiblePromoItemDefIDs_t ( Steam
{ {
return new SteamInventoryEligiblePromoItemDefIDs_t() return new SteamInventoryEligiblePromoItemDefIDs_t()
{ {
Esult = d.Esult, Result = d.Result,
SteamID = d.SteamID, SteamID = d.SteamID,
UmEligiblePromoItemDefs = d.UmEligiblePromoItemDefs, UmEligiblePromoItemDefs = d.UmEligiblePromoItemDefs,
CachedData = d.CachedData, CachedData = d.CachedData,
@ -29593,7 +29593,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
internal struct SteamInventoryStartPurchaseResult_t internal struct SteamInventoryStartPurchaseResult_t
{ {
public const int CallbackId = CallbackIdentifiers.ClientInventory + 4; public const int CallbackId = CallbackIdentifiers.ClientInventory + 4;
public Result Esult; // m_result enum EResult public Result Result; // m_result enum EResult
public ulong OrderID; // m_ulOrderID uint64 public ulong OrderID; // m_ulOrderID uint64
public ulong TransID; // m_ulTransID uint64 public ulong TransID; // m_ulTransID uint64
@ -29609,7 +29609,7 @@ public static SteamInventoryStartPurchaseResult_t FromPointer( IntPtr p )
[StructLayout( LayoutKind.Sequential, Pack = 4 )] [StructLayout( LayoutKind.Sequential, Pack = 4 )]
internal struct PackSmall internal struct PackSmall
{ {
public Result Esult; // m_result enum EResult public Result Result; // m_result enum EResult
public ulong OrderID; // m_ulOrderID uint64 public ulong OrderID; // m_ulOrderID uint64
public ulong TransID; // m_ulTransID uint64 public ulong TransID; // m_ulTransID uint64
@ -29620,7 +29620,7 @@ public static implicit operator SteamInventoryStartPurchaseResult_t ( SteamInve
{ {
return new SteamInventoryStartPurchaseResult_t() return new SteamInventoryStartPurchaseResult_t()
{ {
Esult = d.Esult, Result = d.Result,
OrderID = d.OrderID, OrderID = d.OrderID,
TransID = d.TransID, TransID = d.TransID,
}; };
@ -29874,7 +29874,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
internal struct SteamInventoryRequestPricesResult_t internal struct SteamInventoryRequestPricesResult_t
{ {
public const int CallbackId = CallbackIdentifiers.ClientInventory + 5; public const int CallbackId = CallbackIdentifiers.ClientInventory + 5;
public Result Esult; // m_result enum EResult public Result Result; // m_result enum EResult
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)]
public string Currency; // m_rgchCurrency char [4] public string Currency; // m_rgchCurrency char [4]
@ -29890,7 +29890,7 @@ public static SteamInventoryRequestPricesResult_t FromPointer( IntPtr p )
[StructLayout( LayoutKind.Sequential, Pack = 4 )] [StructLayout( LayoutKind.Sequential, Pack = 4 )]
internal struct PackSmall internal struct PackSmall
{ {
public Result Esult; // m_result enum EResult public Result Result; // m_result enum EResult
[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)] [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)]
public string Currency; // m_rgchCurrency char [4] public string Currency; // m_rgchCurrency char [4]
@ -29901,7 +29901,7 @@ public static implicit operator SteamInventoryRequestPricesResult_t ( SteamInve
{ {
return new SteamInventoryRequestPricesResult_t() return new SteamInventoryRequestPricesResult_t()
{ {
Esult = d.Esult, Result = d.Result,
Currency = d.Currency, Currency = d.Currency,
}; };
} }

3
Generator/CodeWriter/Utility.cs
View File

@ -36,6 +36,7 @@ string CleanMemberName( string m )
if ( m == "m_cubParam" ) return "ParamCount"; if ( m == "m_cubParam" ) return "ParamCount";
if ( m == "m_itemId" ) return "ItemId"; if ( m == "m_itemId" ) return "ItemId";
if ( m == "m_handle" ) return "Handle"; if ( m == "m_handle" ) return "Handle";
if (m == "m_result") return "Result";
var cleanName = m.Replace( "m_un", "" ) var cleanName = m.Replace( "m_un", "" )
.Replace( "m_us", "" ) .Replace( "m_us", "" )
@ -56,6 +57,8 @@ string CleanMemberName( string m )
.Replace( "m_r", "" ) .Replace( "m_r", "" )
.Replace( "m_", "" ); .Replace( "m_", "" );
return cleanName.Substring( 0, 1 ).ToUpper() + cleanName.Substring( 1 ); return cleanName.Substring( 0, 1 ).ToUpper() + cleanName.Substring( 1 );
} }