GitHub/Facepunch.Steamworks
2
0
Fork 0
mirror of https://github.com/Facepunch/Facepunch.Steamworks.git synced 2025-02-03 09:10:41 +03:00
Code Issues Projects Releases Wiki Activity

Inventory.Result.IsPending tries to fill the result if it's finished

Browse Source
This commit is contained in:
Garry Newman 2016-12-08 20:33:42 +00:00
parent f64d0d15af
commit c297033ef7
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,10 +36,26 @@ namespace Facepunch.Steamworks
/// </summary> /// </summary>
public Item[] Consumed { get; internal set; } public Item[] Consumed { get; internal set; }
protected bool _gotResult = false;
/// <summary> /// <summary>
/// Returns true if this result is still pending /// Returns true if this result is still pending
/// </summary> /// </summary>
public bool IsPending { get; internal set; } public bool IsPending
{
get
{
if ( _gotResult ) return false;
if ( Status() == Callbacks.Result.OK )
{
Fill();
return false;
}
return Status() == Callbacks.Result.Pending;
}
}
internal uint Timestamp { get; private set; } internal uint Timestamp { get; private set; }
@ -72,21 +88,23 @@ namespace Facepunch.Steamworks
internal void Fill() internal void Fill()
{ {
if ( _gotResult )
return;
if ( Items != null ) if ( Items != null )
return; return;
this.IsPending = false; if ( Status() != Callbacks.Result.OK )
return;
_gotResult = true;
Timestamp = inventory.inventory.GetResultTimestamp( Handle ); Timestamp = inventory.inventory.GetResultTimestamp( Handle );
SteamNative.SteamItemDetails_t[] steamItems = inventory.inventory.GetResultItems( Handle ); SteamNative.SteamItemDetails_t[] steamItems = inventory.inventory.GetResultItems( Handle );
if ( steamItems == null )
return;
if ( steamItems == null ) if ( steamItems == null )
{ return;
throw new System.Exception( "steamItems was null" );
}
Items = steamItems.Where( x => ( (int)x.Flags & (int)SteamNative.SteamItemFlags.Removed ) != (int)SteamNative.SteamItemFlags.Removed && ( (int)x.Flags & (int)SteamNative.SteamItemFlags.Consumed ) != (int)SteamNative.SteamItemFlags.Consumed ) Items = steamItems.Where( x => ( (int)x.Flags & (int)SteamNative.SteamItemFlags.Removed ) != (int)SteamNative.SteamItemFlags.Removed && ( (int)x.Flags & (int)SteamNative.SteamItemFlags.Consumed ) != (int)SteamNative.SteamItemFlags.Consumed )
.Select( x => .Select( x =>
@ -146,7 +164,9 @@ namespace Facepunch.Steamworks
internal unsafe byte[] Serialize() internal unsafe byte[] Serialize()
{ {
uint size = 0; uint size = 0;
inventory.inventory.SerializeResult( Handle, IntPtr.Zero, out size );
if ( !inventory.inventory.SerializeResult( Handle, IntPtr.Zero, out size ) )
return null;
var data = new byte[size]; var data = new byte[size];