From 34a9cd0c473e2690d4af95be23e2db99ea2ad30a Mon Sep 17 00:00:00 2001 From: morden Date: Fri, 17 Jun 2016 22:57:30 -0400 Subject: [PATCH] fixed android --- .../AdvancedSessions/Classes/AdvancedFriendsLibrary.h | 7 ------- .../Private/AdvancedFriendsLibrary.cpp | 10 ++++++++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h b/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h index 4936a76..48eb676 100644 --- a/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h +++ b/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h @@ -61,11 +61,6 @@ public: UFUNCTION(BlueprintPure, Category = "Online|AdvancedFriends|FriendsList") static void IsAFriend(APlayerController *PlayerController, const FBPUniqueNetId UniqueNetId, bool &IsFriend); - - - -#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX - // Get a texture of a valid friends avatar, STEAM ONLY, Returns invalid texture if the subsystem hasn't loaded that size of avatar yet UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|SteamAPI") static UTexture2D * GetSteamFriendAvatar(const FBPUniqueNetId UniqueNetId, SteamAvatarSize AvatarSize = SteamAvatarSize::SteamAvatar_Medium); @@ -78,6 +73,4 @@ public: UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|SteamAPI") static int32 GetFriendSteamLevel(const FBPUniqueNetId UniqueNetId); -#endif - }; diff --git a/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp b/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp index 30a4441..1e6412c 100644 --- a/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp +++ b/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp @@ -31,9 +31,11 @@ //General Log DEFINE_LOG_CATEGORY(AdvancedFriendsLog); -#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX + int32 UAdvancedFriendsLibrary::GetFriendSteamLevel(const FBPUniqueNetId UniqueNetId) { + +#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid()) { UE_LOG(AdvancedFriendsLog, Warning, TEXT("IsAFriend Had a bad UniqueNetId!")); @@ -46,6 +48,7 @@ int32 UAdvancedFriendsLibrary::GetFriendSteamLevel(const FBPUniqueNetId UniqueNe return SteamFriends()->GetFriendSteamLevel(id); } +#endif return 0; @@ -54,6 +57,7 @@ int32 UAdvancedFriendsLibrary::GetFriendSteamLevel(const FBPUniqueNetId UniqueNe bool UAdvancedFriendsLibrary::RequestSteamFriendInfo(const FBPUniqueNetId UniqueNetId) { +#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid()) { UE_LOG(AdvancedFriendsLog, Warning, TEXT("RequestSteamFriendInfo Had a bad UniqueNetId!")); @@ -66,12 +70,14 @@ bool UAdvancedFriendsLibrary::RequestSteamFriendInfo(const FBPUniqueNetId Unique return !SteamFriends()->RequestUserInformation(id, false); } +#endif return false; } UTexture2D * UAdvancedFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueNetId UniqueNetId, SteamAvatarSize AvatarSize) { +#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid()) { UE_LOG(AdvancedFriendsLog, Warning, TEXT("GetSteamFriendAvatar Had a bad UniqueNetId!")); @@ -152,11 +158,11 @@ UTexture2D * UAdvancedFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueNetId return nullptr; } +#endif UE_LOG(AdvancedFriendsLog, Warning, TEXT("STEAM Couldn't be verified as initialized")); return nullptr; } -#endif void UAdvancedFriendsLibrary::SendSessionInviteToFriends(APlayerController *PlayerController, const TArray &Friends, TEnumAsByte &Result) {