seppdroid/AdvancedSessionsPlugin
1
0
Fork 0
mirror of https://github.com/mordentral/AdvancedSessionsPlugin.git synced 2025-10-23 16:34:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

4.16 Specific Changes

Browse Source 
Former-commit-id: b3b541bbbe53f8e8cba6821599454b1682d2f456
This commit is contained in:
mordentral
2017-04-26 14:55:02 -04:00
parent 92c80023c6
commit b09def7634
4 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs
View File

@@ -3,7 +3,7 @@ using System.IO;
public class AdvancedSessions : ModuleRules public class AdvancedSessions : ModuleRules
{ {
public AdvancedSessions(TargetInfo Target) public AdvancedSessions(ReadOnlyTargetRules Target) : base(Target)
{ {
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
//bEnforceIWYU = true; //bEnforceIWYU = true;

6
AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h
View File

@@ -2,13 +2,13 @@
#pragma once #pragma once
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "Engine/LocalPlayer.h"
#include "BlueprintDataDefinitions.h" #include "BlueprintDataDefinitions.h"
#include "Engine/LocalPlayer.h"
#include "FindFriendSessionCallbackProxy.generated.h" #include "FindFriendSessionCallbackProxy.generated.h"
DECLARE_LOG_CATEGORY_EXTERN(AdvancedFindFriendSessionLog, Log, All); DECLARE_LOG_CATEGORY_EXTERN(AdvancedFindFriendSessionLog, Log, All);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FBlueprintFindFriendSessionDelegate, const FBlueprintSessionResult&, SessionInfo); DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FBlueprintFindFriendSessionDelegate, const TArray<FBlueprintSessionResult>, SessionInfo);
UCLASS(MinimalAPI) UCLASS(MinimalAPI)
class UFindFriendSessionCallbackProxy : public UOnlineBlueprintCallProxyBase class UFindFriendSessionCallbackProxy : public UOnlineBlueprintCallProxyBase
@@ -31,7 +31,7 @@ class UFindFriendSessionCallbackProxy : public UOnlineBlueprintCallProxyBase
private: private:
// Internal callback when the friends list is retrieved // Internal callback when the friends list is retrieved
void OnFindFriendSessionCompleted(int32 LocalPlayer, bool bWasSuccessful, const FOnlineSessionSearchResult& SessionInfo); void OnFindFriendSessionCompleted(int32 LocalPlayer, bool bWasSuccessful, const TArray<FOnlineSessionSearchResult>& SessionInfo);
// The player controller triggering things // The player controller triggering things
TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr; TWeakObjectPtr<APlayerController> PlayerControllerWeakPtr;

29
AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp
View File

@@ -27,7 +27,7 @@ void UFindFriendSessionCallbackProxy::Activate()
{ {
// Fail immediately // Fail immediately
UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed received a bad UniqueNetId!")); UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed received a bad UniqueNetId!"));
FBlueprintSessionResult EmptyResult; TArray<FBlueprintSessionResult> EmptyResult;
OnFailure.Broadcast(EmptyResult); OnFailure.Broadcast(EmptyResult);
return; return;
} }
@@ -36,7 +36,7 @@ void UFindFriendSessionCallbackProxy::Activate()
{ {
// Fail immediately // Fail immediately
UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed received a bad playercontroller!")); UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed received a bad playercontroller!"));
FBlueprintSessionResult EmptyResult; TArray<FBlueprintSessionResult> EmptyResult;
OnFailure.Broadcast(EmptyResult); OnFailure.Broadcast(EmptyResult);
return; return;
} }
@@ -51,7 +51,7 @@ void UFindFriendSessionCallbackProxy::Activate()
{ {
// Fail immediately // Fail immediately
UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed couldn't cast to ULocalPlayer!")); UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed couldn't cast to ULocalPlayer!"));
FBlueprintSessionResult EmptyResult; TArray<FBlueprintSessionResult> EmptyResult;
OnFailure.Broadcast(EmptyResult); OnFailure.Broadcast(EmptyResult);
return; return;
} }
@@ -64,11 +64,12 @@ void UFindFriendSessionCallbackProxy::Activate()
} }
// Fail immediately // Fail immediately
FBlueprintSessionResult EmptyResult; TArray<FBlueprintSessionResult> EmptyResult;
OnFailure.Broadcast(EmptyResult); OnFailure.Broadcast(EmptyResult);
} }
void UFindFriendSessionCallbackProxy::OnFindFriendSessionCompleted(int32 LocalPlayer, bool bWasSuccessful, const FOnlineSessionSearchResult& SessionInfo)
void UFindFriendSessionCallbackProxy::OnFindFriendSessionCompleted(int32 LocalPlayer, bool bWasSuccessful, const TArray<FOnlineSessionSearchResult>& SessionInfo)
{ {
IOnlineSessionPtr Sessions = Online::GetSessionInterface(); IOnlineSessionPtr Sessions = Online::GetSessionInterface();
@@ -77,9 +78,19 @@ void UFindFriendSessionCallbackProxy::OnFindFriendSessionCompleted(int32 LocalPl
if ( bWasSuccessful ) if ( bWasSuccessful )
{ {
FBlueprintSessionResult Result; TArray<FBlueprintSessionResult> Result;
Result.OnlineResult = SessionInfo;
if(Result.OnlineResult.IsValid()) for (auto& Sesh : SessionInfo)
{
if (Sesh.IsValid())
{
FBlueprintSessionResult BSesh;
BSesh.OnlineResult = Sesh;
Result.Add(BSesh);
}
}
if(Result.Num() > 0)
OnSuccess.Broadcast(Result); OnSuccess.Broadcast(Result);
else else
{ {
@@ -90,7 +101,7 @@ void UFindFriendSessionCallbackProxy::OnFindFriendSessionCompleted(int32 LocalPl
else else
{ {
UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed")); UE_LOG(AdvancedFindFriendSessionLog, Warning, TEXT("FindFriendSession Failed"));
FBlueprintSessionResult EmptyResult; TArray<FBlueprintSessionResult> EmptyResult;
OnFailure.Broadcast(EmptyResult); OnFailure.Broadcast(EmptyResult);
} }
} }

2
AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs
View File

@@ -3,7 +3,7 @@ using System.IO;
public class AdvancedSteamSessions : ModuleRules public class AdvancedSteamSessions : ModuleRules
{ {
public AdvancedSteamSessions(TargetInfo Target) public AdvancedSteamSessions(ReadOnlyTargetRules Target) : base(Target)
{ {
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
//bEnforceIWYU = true; //bEnforceIWYU = true;