From 5b2260079cc530545d043f3f68680e95f5e201be Mon Sep 17 00:00:00 2001 From: Louis Raverdy <47295080+LouisRaverdy@users.noreply.github.com> Date: Mon, 18 Oct 2021 22:02:12 +0200 Subject: [PATCH] Update SteamRequestGroupOfficersCallbackProxy.h --- .../SteamRequestGroupOfficersCallbackProxy.h | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h index 389d848..66b80ec 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h @@ -1,9 +1,9 @@ -// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved. -#pragma once - -#include "CoreMinimal.h" -#include "BlueprintDataDefinitions.h" - +// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved. +#pragma once + +#include "CoreMinimal.h" +#include "BlueprintDataDefinitions.h" + // This is taken directly from UE4 - OnlineSubsystemSteamPrivatePCH.h as a fix for the array_count macro // @todo Steam: Steam headers trigger secure-C-runtime warnings in Visual C++. Rather than mess with _CRT_SECURE_NO_WARNINGS, we'll just @@ -22,29 +22,29 @@ #pragma push_macro("ARRAY_COUNT") #undef ARRAY_COUNT -#if USING_CODE_ANALYSIS -MSVC_PRAGMA(warning(push)) -MSVC_PRAGMA(warning(disable : ALL_CODE_ANALYSIS_WARNINGS)) +#if USING_CODE_ANALYSIS +MSVC_PRAGMA(warning(push)) +MSVC_PRAGMA(warning(disable : ALL_CODE_ANALYSIS_WARNINGS)) #endif // USING_CODE_ANALYSIS #include -#if USING_CODE_ANALYSIS -MSVC_PRAGMA(warning(pop)) -#endif // USING_CODE_ANALYSIS +#if USING_CODE_ANALYSIS +MSVC_PRAGMA(warning(pop)) +#endif // USING_CODE_ANALYSIS #pragma pop_macro("ARRAY_COUNT") -#endif - +#endif + // @todo Steam: See above #ifdef _MSC_VER #pragma warning(pop) -#endif - -#include "SteamRequestGroupOfficersCallbackProxy.generated.h" - +#endif + +#include "SteamRequestGroupOfficersCallbackProxy.generated.h" + USTRUCT(BlueprintType, Category = "Online|SteamAPI|SteamGroups") struct FBPSteamGroupOfficer { @@ -55,46 +55,46 @@ public: UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups") FBPUniqueNetId OfficerUniqueNetID; // Uint64 representation UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups") - bool bIsOwner; + bool bIsOwner = false; + +}; + + +DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FBlueprintGroupOfficerDetailsDelegate, const TArray &, OfficerList); + +UCLASS(MinimalAPI) +class USteamRequestGroupOfficersCallbackProxy : public UOnlineBlueprintCallProxyBase +{ + GENERATED_UCLASS_BODY() + + virtual ~USteamRequestGroupOfficersCallbackProxy(); + + // Called when there is a successful results return + UPROPERTY(BlueprintAssignable) + FBlueprintGroupOfficerDetailsDelegate OnSuccess; + + // Called when there is an unsuccessful results return + UPROPERTY(BlueprintAssignable) + FBlueprintGroupOfficerDetailsDelegate OnFailure; + + // Returns a list of steam group officers + UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|SteamAPI|SteamGroups") + static USteamRequestGroupOfficersCallbackProxy* GetSteamGroupOfficerList(UObject* WorldContextObject, FBPUniqueNetId GroupUniqueNetID); + + // UOnlineBlueprintCallProxyBase interface + virtual void Activate() override; + // End of UOnlineBlueprintCallProxyBase interface + +private: -}; - - -DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FBlueprintGroupOfficerDetailsDelegate, const TArray &, OfficerList); - -UCLASS(MinimalAPI) -class USteamRequestGroupOfficersCallbackProxy : public UOnlineBlueprintCallProxyBase -{ - GENERATED_UCLASS_BODY() - - virtual ~USteamRequestGroupOfficersCallbackProxy(); - - // Called when there is a successful results return - UPROPERTY(BlueprintAssignable) - FBlueprintGroupOfficerDetailsDelegate OnSuccess; - - // Called when there is an unsuccessful results return - UPROPERTY(BlueprintAssignable) - FBlueprintGroupOfficerDetailsDelegate OnFailure; - - // Returns a list of steam group officers - UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|SteamAPI|SteamGroups") - static USteamRequestGroupOfficersCallbackProxy* GetSteamGroupOfficerList(UObject* WorldContextObject, FBPUniqueNetId GroupUniqueNetID); - - // UOnlineBlueprintCallProxyBase interface - virtual void Activate() override; - // End of UOnlineBlueprintCallProxyBase interface - -private: - #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX void OnRequestGroupOfficerDetails( ClanOfficerListResponse_t *pResult, bool bIOFailure); - CCallResult m_callResultGroupOfficerRequestDetails; - -#endif - -private: - - FBPUniqueNetId GroupUniqueID; - UObject* WorldContextObject; -}; \ No newline at end of file + CCallResult m_callResultGroupOfficerRequestDetails; + +#endif + +private: + + FBPUniqueNetId GroupUniqueID; + UObject* WorldContextObject; +};