Added OpenSteamUserOverlay to the AdvancedSteamFriendsLibrary

Former-commit-id: d68e0533494ae204e8d7583601308fcd8f95e64a

.gitignore

@@ -1,10 +0,0 @@
-
-.hg/
-binaries/
-deriveddatacache/
-.vs/
-build/
-intermediate/
-PACKPLUGIN/
-saved/
-*.orig

AdvancedSessions/AdvancedSessions.uplugin

@@ -2,8 +2,8 @@
     "FileVersion" : 3,
  
     "FriendlyName" : "Advanced Sessions",
-    "Version" : 4.24,
-    "VersionName": "4.24",
+    "Version" : 4.20,
+    "VersionName": "4.20",
     "Description" : "Adds new blueprint functions to handle more advanced session operations.",
     "Category" : "Advanced Sessions Plugin",
     "CreatedBy" : "Joshua Statzer",

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h

@@ -2,7 +2,6 @@
 
 #pragma once
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
 #include "BlueprintDataDefinitions.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h

@@ -1,70 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-#include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "Online.h"
-#include "OnlineSubsystem.h"
-#include "Engine/GameInstance.h"
-#include "GameFramework/GameModeBase.h"
-#include "GameFramework/GameSession.h"
-
-//#include "UObjectIterator.h"
-
-#include "AdvancedGameSession.generated.h"
-
-
-
-
-/**
- A quick wrapper around the game session to add a partial ban implementation. Just bans for the duration of the current session
-*/
-UCLASS(config = Game, notplaceable)
-class AAdvancedGameSession : public AGameSession
-{
-	GENERATED_UCLASS_BODY()
-
-public:
-
-	UPROPERTY(Transient)
-	TMap<FUniqueNetIdRepl, FText> BanList;
-
-	virtual bool BanPlayer(class APlayerController* BannedPlayer, const FText& BanReason)
-	{
-
-		if (APlayerState* PlayerState = (BannedPlayer != NULL) ? BannedPlayer->PlayerState : NULL)
-		{
-			FUniqueNetIdRepl UniqueNetID = PlayerState->GetUniqueId();
-			bool bWasKicked = KickPlayer(BannedPlayer, BanReason);
-
-			if (bWasKicked)
-			{
-				BanList.Add(UniqueNetID, BanReason);
-			}
-
-			return bWasKicked;
-		}
-		
-		return false;
-	}
-
-	// This should really be handled in the game mode asking game session, but I didn't want to force a custom game session AND game mode
-	// If done in the game mode, we could check prior to actually spooling up any player information in ApproveLogin
-	virtual void PostLogin(APlayerController* NewPlayer) override
-	{
-		if (APlayerState* PlayerState = (NewPlayer != NULL) ? NewPlayer->PlayerState : NULL)
-		{
-			FUniqueNetIdRepl UniqueNetID = PlayerState->GetUniqueId();
-
-			if (BanList.Contains(UniqueNetID))
-			{
-				KickPlayer(NewPlayer, BanList[UniqueNetID]);
-			}
-		}
-	}
-};
-
-AAdvancedGameSession::AAdvancedGameSession(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-{
-}

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h

@@ -2,7 +2,6 @@
 
 #pragma once
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
 #include "BlueprintDataDefinitions.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
@@ -14,9 +13,6 @@
 #include "Engine/GameInstance.h"
 #include "Interfaces/OnlineSessionInterface.h"
 
-#include "GameFramework/GameModeBase.h"
-#include "GameFramework/GameSession.h"
-
 //#include "UObjectIterator.h"
 
 #include "AdvancedSessionsLibrary.generated.h"
@@ -31,17 +27,6 @@ class UAdvancedSessionsLibrary : public UBlueprintFunctionLibrary
 {
 	GENERATED_BODY()
 public:
-		//********* Session Admin Functions *************//	
-
-		// Kick a player from the currently active game session, only available on the server
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions", meta = (WorldContext = "WorldContextObject"))
-		static bool KickPlayer(UObject* WorldContextObject, APlayerController* PlayerToKick, FText KickReason);
-
-		// Ban a player from the currently active game session, only available on the server
-		// Note that the default gamesession class does not implement an actual ban list and just kicks when this is called
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions", meta = (WorldContext = "WorldContextObject"))
-		static bool BanPlayer(UObject* WorldContextObject, APlayerController* PlayerToBan, FText BanReason);
-
 		//********* Session Search Functions *************//	
 
 		// Adds or modifies session settings in an existing array depending on if they exist already or not
@@ -53,16 +38,16 @@ public:
 		static void GetExtraSettings(FBlueprintSessionResult SessionResult, TArray<FSessionPropertyKeyPair> & ExtraSettings);
 
 		// Get the current session state
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (WorldContext = "WorldContextObject"))
-		static void GetSessionState(UObject* WorldContextObject, EBPOnlineSessionState &SessionState);
+		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo")
+		static void GetSessionState(EBPOnlineSessionState &SessionState);
 
 		// Get the current session settings
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "Result", WorldContext = "WorldContextObject"))
-		static void GetSessionSettings(UObject* WorldContextObject, int32 &NumConnections, int32 &NumPrivateConnections, bool &bIsLAN, bool &bIsDedicated, bool &bAllowInvites, bool &bAllowJoinInProgress, bool &bIsAnticheatEnabled, int32 &BuildUniqueID, TArray<FSessionPropertyKeyPair> &ExtraSettings, EBlueprintResultSwitch &Result);
+		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "Result"))
+		static void GetSessionSettings(int32 &NumConnections, int32 &NumPrivateConnections, bool &bIsLAN, bool &bIsDedicated, bool &bAllowInvites, bool &bAllowJoinInProgress, bool &bIsAnticheatEnabled, int32 &BuildUniqueID, TArray<FSessionPropertyKeyPair> &ExtraSettings, EBlueprintResultSwitch &Result);
 
 		// Check if someone is in the current session
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (WorldContext = "WorldContextObject"))
-		static void IsPlayerInSession(UObject* WorldContextObject, const FBPUniqueNetId &PlayerToCheck, bool &bIsInSession);
+		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo")
+		static void IsPlayerInSession(const FBPUniqueNetId &PlayerToCheck, bool &bIsInSession);
 		
 		// Make a literal session search parameter
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo|Literals")
@@ -75,14 +60,6 @@ public:
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo")
 		static bool IsValidSession(const FBlueprintSessionResult & SessionResult);
 
-		// Get a string copy of a session ID
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo")
-		static void GetSessionID_AsString(const FBlueprintSessionResult & SessionResult, FString& SessionID);
-
-		// Get a string copy of the current session ID
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo", meta = (WorldContext = "WorldContextObject"))
-		static void GetCurrentSessionID_AsString(UObject* WorldContextObject, FString& SessionID);
-
 		// Get the Unique Current Build ID
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo")
 		static void GetCurrentUniqueBuildID(int32 &UniqueBuildId);
@@ -115,7 +92,6 @@ public:
 		static void GetSessionPropertyByte(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, uint8 &SettingValue);
 
 		// Get session custom information key/value as Bool
-		// Steam only currently supports Int,Float,String,BYTE values for search filtering!!!
 		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult"))
 		static void GetSessionPropertyBool(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, bool &SettingValue);
 
@@ -137,7 +113,6 @@ public:
 		static FSessionPropertyKeyPair MakeLiteralSessionPropertyByte(FName Key, uint8 Value);
 
 		// Make a literal session custom information key/value pair from Bool
-		// Steam only currently supports Int,Float,String,BYTE values for search filtering!
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo|Literals")
 		static FSessionPropertyKeyPair MakeLiteralSessionPropertyBool(FName Key, bool Value);
 
@@ -200,11 +175,5 @@ public:
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|Misc")
 		static bool HasOnlineSubsystem(FName SubSystemName);
 
-		//**** Seamless travel Functions ****//
-		
-		//Exposes Server travel to blueprint
-		UFUNCTION(BlueprintCallable, BlueprintAuthorityOnly, Category = "Online|AdvancedSessions|Seamless", meta = (HidePin = "WorldContextObject", DefaultToSelf = "WorldContextObject"))
-		static bool ServerTravel(UObject* WorldContextObject, const FString& InURL, bool bAbsolute, bool bShouldSkipGameNotify);
-
 		
 };	

AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h

@@ -1,7 +1,6 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 #pragma once
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
 #include "Interfaces/OnlineSessionInterface.h"
 #include "BlueprintDataDefinitions.h"
 #include "CancelFindSessionsCallbackProxy.generated.h"

AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
 #include "BlueprintDataDefinitions.h"
 #include "CreateSessionCallbackProxyAdvanced.generated.h"
 

AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h

@@ -1,7 +1,6 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 #pragma once
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
 #include "Interfaces/OnlineSessionInterface.h"
 #include "BlueprintDataDefinitions.h"
 #include "EndSessionCallbackProxy.generated.h"

AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h

@@ -1,7 +1,6 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 #pragma once
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
 #include "Interfaces/OnlineSessionInterface.h"
 #include "FindSessionsCallbackProxy.h"
 #include "BlueprintDataDefinitions.h"

AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h

@@ -2,7 +2,6 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
 #include "BlueprintDataDefinitions.h"
 #include "UpdateSessionCallbackProxyAdvanced.generated.h"
 

AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp

@@ -124,7 +124,7 @@ void UAdvancedExternalUILibrary::ShowInviteUI(APlayerController *PlayerControlle
 		return;
 	}
 
-	ExternalUIInterface->ShowInviteUI(Player->GetControllerId(), NAME_GameSession);
+	ExternalUIInterface->ShowInviteUI(Player->GetControllerId(), GameSessionName);
 	Result = EBlueprintResultSwitch::OnSuccess;
 }
 

AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp

@@ -22,7 +22,7 @@ UAdvancedFriendsGameInstance::UAdvancedFriendsGameInstance(const FObjectInitiali
 
 void UAdvancedFriendsGameInstance::Shutdown()
 {
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld());
+	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface();
 	
 	if (!SessionInterface.IsValid())
 	{
@@ -39,7 +39,7 @@ void UAdvancedFriendsGameInstance::Shutdown()
 
 	if (bEnableTalkingStatusDelegate)
 	{
-		IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(GetWorld());
+		IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();
 
 		if (VoiceInterface.IsValid())
 		{
@@ -52,7 +52,7 @@ void UAdvancedFriendsGameInstance::Shutdown()
 		}
 	}
 
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(GetWorld());
+	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface();
 
 	if (IdentityInterface.IsValid())
 	{
@@ -69,7 +69,7 @@ void UAdvancedFriendsGameInstance::Shutdown()
 
 void UAdvancedFriendsGameInstance::Init()
 {
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld());//OnlineSub->GetSessionInterface();
+	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface();//OnlineSub->GetSessionInterface();
 
 	if (SessionInterface.IsValid())
 	{
@@ -90,7 +90,7 @@ void UAdvancedFriendsGameInstance::Init()
 	// Beginning work on the voice interface
 	if (bEnableTalkingStatusDelegate)
 	{
-		IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(GetWorld());
+		IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();
 
 		if (VoiceInterface.IsValid())
 		{
@@ -103,7 +103,7 @@ void UAdvancedFriendsGameInstance::Init()
 		}
 	}
 
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(GetWorld());
+	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface();
 
 	if (IdentityInterface.IsValid())
 	{

AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp

@@ -50,7 +50,7 @@ void UAdvancedFriendsLibrary::SendSessionInviteToFriends(APlayerController *Play
 		List.Add(val);
 	}
 
-	if (SessionInterface->SendSessionInviteToFriends(Player->GetControllerId(), NAME_GameSession, List))
+	if (SessionInterface->SendSessionInviteToFriends(Player->GetControllerId(), GameSessionName, List))
 	{
 		Result = EBlueprintResultSwitch::OnSuccess;
 		return;
@@ -94,7 +94,7 @@ void UAdvancedFriendsLibrary::SendSessionInviteToFriend(APlayerController *Playe
 		return;
 	}
 
-	if (SessionInterface->SendSessionInviteToFriend(Player->GetControllerId(), NAME_GameSession, *FriendUniqueNetId.GetUniqueNetId()))
+	if (SessionInterface->SendSessionInviteToFriend(Player->GetControllerId(), GameSessionName, *FriendUniqueNetId.GetUniqueNetId()))
 	{
 		Result = EBlueprintResultSwitch::OnSuccess;
 		return;

AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp

@@ -1,93 +1,17 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 #include "AdvancedSessionsLibrary.h"
+
 #include "GameFramework/PlayerState.h"
 #include "GameFramework/GameStateBase.h"
 
 //General Log
 DEFINE_LOG_CATEGORY(AdvancedSessionsLog);
 
-
-bool UAdvancedSessionsLibrary::KickPlayer(UObject* WorldContextObject, APlayerController* PlayerToKick, FText KickReason)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-
-	if (World)
-	{
-		if (AGameModeBase* GameMode = World->GetAuthGameMode())
-		{
-			if (GameMode->GameSession)
-			{
-				return GameMode->GameSession->KickPlayer(PlayerToKick, KickReason);
-			}
-		}
-	}
-
-	return false;
-}
-
-bool UAdvancedSessionsLibrary::BanPlayer(UObject* WorldContextObject, APlayerController* PlayerToBan, FText BanReason)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-
-	if (World)
-	{
-		if (AGameModeBase* GameMode = World->GetAuthGameMode())
-		{
-			if (GameMode->GameSession)
-			{
-				return GameMode->GameSession->BanPlayer(PlayerToBan, BanReason);
-			}
-		}
-	}
-
-	return false;
-}
-
 bool UAdvancedSessionsLibrary::IsValidSession(const FBlueprintSessionResult & SessionResult)
 {
 	return SessionResult.OnlineResult.IsValid();
 }
 
-void UAdvancedSessionsLibrary::GetSessionID_AsString(const FBlueprintSessionResult & SessionResult, FString& SessionID)
-{
-	const TSharedPtr<class FOnlineSessionInfo> SessionInfo = SessionResult.OnlineResult.Session.SessionInfo;
-	if (SessionInfo.IsValid() && SessionInfo->IsValid() && SessionInfo->GetSessionId().IsValid())
-	{
-		SessionID = SessionInfo->GetSessionId().ToString();
-		return;
-	}
-
-	// Zero the string out if we didn't have a valid one, in case this is called in c++
-	SessionID.Empty();
-}
-
-void UAdvancedSessionsLibrary::GetCurrentSessionID_AsString(UObject* WorldContextObject, FString& SessionID)
-{
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(World);
-
-	if (!SessionInterface.IsValid()) 
-	{
-		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetCurrentSessionID_AsString couldn't get the session interface!"));
-		SessionID.Empty();
-		return;
-	}
-
-	const FNamedOnlineSession* Session = SessionInterface->GetNamedSession(NAME_GameSession);
-	if (Session != nullptr) 
-	{
-		const TSharedPtr<class FOnlineSessionInfo> SessionInfo = Session->SessionInfo;
-		if (SessionInfo.IsValid() && SessionInfo->IsValid() && SessionInfo->GetSessionId().IsValid()) 
-		{
-			SessionID = SessionInfo->GetSessionId().ToString();
-			return;
-		}
-	}
-
-	// Zero the string out if we didn't have a valid one, in case this is called in c++
-	SessionID.Empty();
-}
-
 void UAdvancedSessionsLibrary::GetCurrentUniqueBuildID(int32 &UniqueBuildId)
 {
 	UniqueBuildId = GetBuildUniqueId();
@@ -163,10 +87,9 @@ void UAdvancedSessionsLibrary::GetExtraSettings(FBlueprintSessionResult SessionR
 	}
 }
 
-void UAdvancedSessionsLibrary::GetSessionState(UObject* WorldContextObject, EBPOnlineSessionState &SessionState)
+void UAdvancedSessionsLibrary::GetSessionState(EBPOnlineSessionState &SessionState)
 {
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(World);
+	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface();
 
 	if (!SessionInterface.IsValid())
 	{
@@ -174,13 +97,12 @@ void UAdvancedSessionsLibrary::GetSessionState(UObject* WorldContextObject, EBPO
 		return;
 	}
 
-	SessionState = ((EBPOnlineSessionState)SessionInterface->GetSessionState(NAME_GameSession));
+	SessionState = ((EBPOnlineSessionState)SessionInterface->GetSessionState(GameSessionName));
 }
 
-void UAdvancedSessionsLibrary::GetSessionSettings(UObject* WorldContextObject, int32 &NumConnections, int32 &NumPrivateConnections, bool &bIsLAN, bool &bIsDedicated, bool &bAllowInvites, bool &bAllowJoinInProgress, bool &bIsAnticheatEnabled, int32 &BuildUniqueID, TArray<FSessionPropertyKeyPair> &ExtraSettings, EBlueprintResultSwitch &Result)
+void UAdvancedSessionsLibrary::GetSessionSettings(int32 &NumConnections, int32 &NumPrivateConnections, bool &bIsLAN, bool &bIsDedicated, bool &bAllowInvites, bool &bAllowJoinInProgress, bool &bIsAnticheatEnabled, int32 &BuildUniqueID, TArray<FSessionPropertyKeyPair> &ExtraSettings, EBlueprintResultSwitch &Result)
 {
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(World);
+	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface();
 
 	if (!SessionInterface.IsValid())
 	{
@@ -189,7 +111,7 @@ void UAdvancedSessionsLibrary::GetSessionSettings(UObject* WorldContextObject, i
 		return;
 	}
 
-	FOnlineSessionSettings* settings = SessionInterface->GetSessionSettings(NAME_GameSession);
+	FOnlineSessionSettings* settings = SessionInterface->GetSessionSettings(GameSessionName);
 	if (!settings)
 	{
 		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetSessionSettings couldn't get the session settings!"));
@@ -218,10 +140,9 @@ void UAdvancedSessionsLibrary::GetSessionSettings(UObject* WorldContextObject, i
 	Result = EBlueprintResultSwitch::OnSuccess;
 }
 
-void UAdvancedSessionsLibrary::IsPlayerInSession(UObject* WorldContextObject, const FBPUniqueNetId &PlayerToCheck, bool &bIsInSession)
+void UAdvancedSessionsLibrary::IsPlayerInSession(const FBPUniqueNetId &PlayerToCheck, bool &bIsInSession)
 {
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(World);
+	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface();
 
 	if (!SessionInterface.IsValid())
 	{
@@ -230,7 +151,7 @@ void UAdvancedSessionsLibrary::IsPlayerInSession(UObject* WorldContextObject, co
 		return;
 	}
 
-	bIsInSession = SessionInterface->IsPlayerInSession(NAME_GameSession, *PlayerToCheck.GetUniqueNetId());
+	bIsInSession = SessionInterface->IsPlayerInSession(GameSessionName, *PlayerToCheck.GetUniqueNetId());
 }
 
 FSessionsSearchSetting UAdvancedSessionsLibrary::MakeLiteralSessionSearchProperty(FSessionPropertyKeyPair SessionSearchProperty, EOnlineComparisonOpRedux ComparisonOp)
@@ -528,14 +449,3 @@ void UAdvancedSessionsLibrary::GetNumberOfNetworkPlayers(UObject* WorldContextOb
 
 	NumNetPlayers = TheWorld->GetGameState()->PlayerArray.Num();
 }
-
-bool UAdvancedSessionsLibrary::ServerTravel(UObject* WorldContextObject, const FString& FURL, bool bAbsolute, bool bShouldSkipGameNotify)
-{
-	if (!WorldContextObject) return false;
-
-	//using a context object to get the world
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::ReturnNull);
-	if (!World) return false;
-	World->ServerTravel(FURL,bAbsolute,bShouldSkipGameNotify);
-	return true;
-}

AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp

@@ -1,4 +1,5 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
+
 #include "CancelFindSessionsCallbackProxy.h"
 
 

AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp

@@ -83,7 +83,7 @@ void UCreateSessionCallbackProxyAdvanced::Activate()
 			{
 				if (PlayerControllerWeakPtr.IsValid() && Helper.UserID.IsValid())
 				{
-					Sessions->CreateSession(*Helper.UserID, NAME_GameSession, Settings);
+					Sessions->CreateSession(*Helper.UserID, GameSessionName, Settings);
 				}
 				else
 				{
@@ -95,7 +95,7 @@ void UCreateSessionCallbackProxyAdvanced::Activate()
 				}
 			}
 			else
-				Sessions->CreateSession(0, NAME_GameSession, Settings);
+				Sessions->CreateSession(0, GameSessionName, Settings);
 
 			// OnCreateCompleted will get called, nothing more to do now
 			return;
@@ -125,7 +125,7 @@ void UCreateSessionCallbackProxyAdvanced::OnCreateCompleted(FName SessionName, b
 			if (bWasSuccessful)
 			{
 				StartCompleteDelegateHandle = Sessions->AddOnStartSessionCompleteDelegate_Handle(StartCompleteDelegate);
-				Sessions->StartSession(NAME_GameSession);
+				Sessions->StartSession(GameSessionName);
 
 				// OnStartCompleted will get called, nothing more to do now
 				return;

AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp

@@ -1,4 +1,5 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
+
 #include "EndSessionCallbackProxy.h"
 
 
@@ -29,12 +30,12 @@ void UEndSessionCallbackProxy::Activate()
 		auto Sessions = Helper.OnlineSub->GetSessionInterface();
 		if (Sessions.IsValid())
 		{
-			FNamedOnlineSession* Session = Sessions->GetNamedSession(NAME_GameSession);
+			FNamedOnlineSession* Session = Sessions->GetNamedSession(GameSessionName);
 			if (Session &&
 				Session->SessionState == EOnlineSessionState::InProgress)
 			{
 				DelegateHandle = Sessions->AddOnEndSessionCompleteDelegate_Handle(Delegate);
-				Sessions->EndSession(NAME_GameSession);
+				Sessions->EndSession(GameSessionName);
 			}
 			else
 			{

AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp

@@ -41,7 +41,7 @@ void UFindFriendSessionCallbackProxy::Activate()
 		return;
 	}
 
-	IOnlineSessionPtr Sessions = Online::GetSessionInterface(GetWorld());
+	IOnlineSessionPtr Sessions = Online::GetSessionInterface();
 
 	if (Sessions.IsValid())
 	{	
@@ -71,7 +71,7 @@ void UFindFriendSessionCallbackProxy::Activate()
 
 void UFindFriendSessionCallbackProxy::OnFindFriendSessionCompleted(int32 LocalPlayer, bool bWasSuccessful, const TArray<FOnlineSessionSearchResult>& SessionInfo)
 {
-	IOnlineSessionPtr Sessions = Online::GetSessionInterface(GetWorld());
+	IOnlineSessionPtr Sessions = Online::GetSessionInterface();
 
 	if (Sessions.IsValid())
 		Sessions->ClearOnFindFriendSessionCompleteDelegate_Handle(LocalPlayer, FindFriendSessionCompleteDelegateHandle);

AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp

@@ -1,4 +1,5 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
+
 #include "FindSessionsCallbackProxyAdvanced.h"
 
 

AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp

@@ -30,7 +30,7 @@ UUpdateSessionCallbackProxyAdvanced* UUpdateSessionCallbackProxyAdvanced::Update
 void UUpdateSessionCallbackProxyAdvanced::Activate()
 {
 
-	IOnlineSessionPtr Sessions = Online::GetSessionInterface(GetWorld());
+	IOnlineSessionPtr Sessions = Online::GetSessionInterface();
 
 	if (Sessions.IsValid())
 	{
@@ -42,8 +42,8 @@ void UUpdateSessionCallbackProxyAdvanced::Activate()
 		}
 
 		// This gets the actual session itself
-		//FNamedOnlineSession * curSession = Sessions->GetNamedSession(NAME_GameSession);
-		FOnlineSessionSettings* Settings = Sessions->GetSessionSettings(NAME_GameSession);
+		//FNamedOnlineSession * curSession = Sessions->GetNamedSession(GameSessionName);
+		FOnlineSessionSettings* Settings = Sessions->GetSessionSettings(GameSessionName);
 
 		if (!Settings)
 		{
@@ -85,7 +85,7 @@ void UUpdateSessionCallbackProxyAdvanced::Activate()
 			}
 		}
 
-		Sessions->UpdateSession(NAME_GameSession, *Settings, bRefreshOnlineData);
+		Sessions->UpdateSession(GameSessionName, *Settings, bRefreshOnlineData);
 
 		// OnUpdateCompleted will get called, nothing more to do now
 		return;
@@ -101,7 +101,7 @@ void UUpdateSessionCallbackProxyAdvanced::Activate()
 
 void UUpdateSessionCallbackProxyAdvanced::OnUpdateCompleted(FName SessionName, bool bWasSuccessful)
 {
-	IOnlineSessionPtr Sessions = Online::GetSessionInterface(GetWorld());
+	IOnlineSessionPtr Sessions = Online::GetSessionInterface();
 	if (Sessions.IsValid())
 	{
 		Sessions->ClearOnUpdateSessionCompleteDelegate_Handle(OnUpdateSessionCompleteDelegateHandle);

AdvancedSteamSessions/AdvancedSteamSessions.uplugin

@@ -2,8 +2,8 @@
     "FileVersion" : 3,
  
     "FriendlyName" : "Advanced Steam Sessions",
-    "Version" : 4.24,
-    "VersionName": "4.24",
+    "Version" : 4.20,
+    "VersionName": "4.20",
     "Description" : "Adds new blueprint functions to handle more advanced session operations in Steam. REQUIRES ADVANCED SESSIONS",
     "Category" : "Advanced Sessions Plugin",
     "CreatedBy" : "Joshua Statzer",

AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h

@@ -197,8 +197,7 @@ public:
 	/** Needed for TMap::GetTypeHash() */
 	friend uint32 GetTypeHash(const FUniqueNetIdSteam2& A)
 	{
-		return GetTypeHash(A.UniqueNetId);
-		//return (uint32)(A.UniqueNetId) + ((uint32)((A.UniqueNetId) >> 32) * 23);
+		return (uint32)(A.UniqueNetId) + ((uint32)((A.UniqueNetId) >> 32) * 23);
 	}
 
 	/** Convenience cast to CSteamID */
@@ -242,7 +241,6 @@ DECLARE_LOG_CATEGORY_EXTERN(AdvancedSteamFriendsLog, Log, All);
 UENUM(Blueprintable)
 enum class SteamAvatarSize : uint8
 {
-	SteamAvatar_INVALID = 0,
 	SteamAvatar_Small = 1,
 	SteamAvatar_Medium = 2,
 	SteamAvatar_Large = 3
@@ -337,10 +335,6 @@ public:
 	UFUNCTION(BlueprintPure, Category = "Online|AdvancedFriends|SteamAPI")
 	static FBPUniqueNetId CreateSteamIDFromString(const FString SteamID64);
 
-	// Retreives the local steam ID from steam
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedFriends|SteamAPI")
-		static FBPUniqueNetId GetLocalSteamIDFromSteam();
-
 	/* Gets the current game played by a friend - AppID is int32 even though steam ids are uint32, can't be helped in blueprint currently
 	*  can use the AppID with the WebAPI GetAppList request.
 	*/

AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h

@@ -6,10 +6,6 @@
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-#include "steam/isteamugc.h"
-#include "steam/isteamremotestorage.h"
-#endif
 #include "Interfaces/OnlineSessionInterface.h"
 
 // @todo Steam: Steam headers trigger secure-C-runtime warnings in Visual C++. Rather than mess with _CRT_SECURE_NO_WARNINGS, we'll just
@@ -83,7 +79,6 @@ public:
 UENUM(BlueprintType)
 enum class FBPSteamResult : uint8
 {
-	K_EResultInvalid = 0,
 	k_EResultOK = 1,							// success
 	k_EResultFail = 2,							// generic failure 
 	k_EResultNoConnection = 3,					// no/failed network connection
@@ -208,22 +203,11 @@ struct FBPSteamWorkshopItemDetails
 	GENERATED_USTRUCT_BODY()
 
 public:
-
 	FBPSteamWorkshopItemDetails()
 	{
-		ResultOfRequest = FBPSteamResult::k_EResultOK;
-		FileType = FBPWorkshopFileType::k_EWorkshopFileTypeMax;
-		CreatorAppID = 0;
-		ConsumerAppID = 0;
-		VotesUp = 0;
-		VotesDown = 0;
-		CalculatedScore = 0.f;
-		bBanned = false;
-		bAcceptedForUse = false;
-		bTagsTruncated = false;
+
 	}
 
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	FBPSteamWorkshopItemDetails(SteamUGCDetails_t &hUGCDetails)
 	{
 		ResultOfRequest = (FBPSteamResult)hUGCDetails.m_eResult;
@@ -261,7 +245,6 @@ public:
 
 		CreatorSteamID = FString::Printf(TEXT("%llu"), hUGCDetails.m_ulSteamIDOwner);
 	}
-#endif
 
 	// Result of obtaining the details
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|AdvancedSteamWorkshop")

AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp

@@ -196,21 +196,6 @@ FBPUniqueNetId UAdvancedSteamFriendsLibrary::CreateSteamIDFromString(const FStri
 	return netId;
 }
 
-FBPUniqueNetId UAdvancedSteamFriendsLibrary::GetLocalSteamIDFromSteam()
-{
-	FBPUniqueNetId netId;
-
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-	if (SteamAPI_Init())
-	{
-		TSharedPtr<const FUniqueNetId> SteamID(new const FUniqueNetIdSteam2(SteamUser()->GetSteamID()));
-		netId.SetUniqueNetId(SteamID);
-	}
-#endif
-
-	return netId;
-}
-
 bool UAdvancedSteamFriendsLibrary::RequestSteamFriendInfo(const FBPUniqueNetId UniqueNetId, bool bRequireNameOnly)
 {
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
@@ -328,7 +313,7 @@ UTexture2D * UAdvancedSteamFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueN
 			delete[] oAvatarRGBA;
 
 			//Setting some Parameters for the Texture and finally returning it
-			Avatar->PlatformData->SetNumSlices(1);
+			Avatar->PlatformData->NumSlices = 1;
 			Avatar->NeverStream = true;
 			//Avatar->CompressionSettings = TC_EditorIcon;
 

AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp

@@ -4,9 +4,6 @@
 #include "UObject/CoreOnline.h"
 #include "AdvancedSteamFriendsLibrary.h"
 #include "OnlineSubSystemHeader.h"
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-#include "steam/isteamfriends.h"
-#endif
 //#include "OnlineSubsystemSteamTypes.h"
 
 //////////////////////////////////////////////////////////////////////////
@@ -45,11 +42,12 @@ void USteamRequestGroupOfficersCallbackProxy::Activate()
 	OnFailure.Broadcast(EmptyArray);
 }
 
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanOfficerListResponse_t *pResult, bool bIOFailure)
 {
 	TArray<FBPSteamGroupOfficer> OfficerArray;
 	
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
+	
 	FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM));
 
 	if (bIOFailure || !pResult || !pResult->m_bSuccess)
@@ -113,9 +111,9 @@ void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanO
 			});
 		}
 	}
+#endif
 
 	// Should never hit this anyway
 	//OnFailure.Broadcast(OfficerArray);
 }
-#endif
 

AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp

@@ -2,9 +2,6 @@
 
 #include "SteamWSRequestUGCDetailsCallbackProxy.h"
 #include "OnlineSubSystemHeader.h"
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-#include "steam/isteamugc.h"
-#endif
 
 //////////////////////////////////////////////////////////////////////////
 // UEndSessionCallbackProxy
@@ -49,9 +46,10 @@ void USteamWSRequestUGCDetailsCallbackProxy::Activate()
 	OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
 }
 
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 void USteamWSRequestUGCDetailsCallbackProxy::OnUGCRequestUGCDetails(SteamUGCQueryCompleted_t *pResult, bool bIOFailure)
 {
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
+	
 	FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM));
 
 	if (bIOFailure || !pResult || pResult->m_unNumResultsReturned <= 0)
@@ -93,9 +91,9 @@ void USteamWSRequestUGCDetailsCallbackProxy::OnUGCRequestUGCDetails(SteamUGCQuer
 			});
 		}
 	}
+#endif
 
 	// Not needed, should never hit here
 	//OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
 }
-#endif