Creating 4.16 locked branch

Former-commit-id: 79eaea35412f68ccb0723efdd4c0b87dbea279a0

.gitattributes

@@ -1,2 +0,0 @@
-* text=auto
-*.bat eol=crlf

.gitignore

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

AdvancedSessions/AdvancedSessions.uplugin

@@ -1,34 +1,20 @@
 {
-	"FileVersion": 3,
-	"FriendlyName": "Advanced Sessions",
-	"Version": 4,
-	"VersionName": "5.0",
-	"Description": "Adds new blueprint functions to handle more advanced session operations.",
-	"Category": "Advanced Sessions Plugin",
-	"CreatedBy": "Joshua Statzer",
-	"CreatedByURL": "N/A",
-	"Modules": [
-		{
-			"Name": "AdvancedSessions",
-			"Type": "Runtime",
-			"LoadingPhase": "PreDefault"
-		}
-	],
-	"Plugins": [
-		{
-			"Name": "OnlineSubsystem",
-			"Enabled": true
-		},
-		{
-			"Name": "OnlineSubsystemUtils",
-			"Enabled": true
-		}
-	],
-	"DocsURL": "",
-	"MarketplaceURL": "",
-	"SupportURL": "",
-	"CanContainContent": false,
-	"IsBetaVersion": false,
-	"IsExperimentalVersion": false,
-	"Installed": false
+    "FileVersion" : 3,
+ 
+    "FriendlyName" : "Advanced Sessions",
+    "Version" : 1.9,
+    "VersionName": "1.9",
+    "Description" : "Adds new blueprint functions to handle more advanced session operations.",
+    "Category" : "Advanced Sessions Plugin",
+    "CreatedBy" : "Joshua Statzer",
+    "CreatedByURL" : "N/A",
+ 
+    "Modules" :
+    [
+        {
+            "Name" : "AdvancedSessions",
+            "Type" : "RunTime",
+			"LoadingPhase" : "PreDefault"
+        } 
+    ]
 }

AdvancedSessions/Config/FilterPlugin.ini

@@ -1,8 +0,0 @@
-[FilterPlugin]
-; This section lists additional files which will be packaged along with your plugin. Paths should be listed relative to the root plugin directory, and
-; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively.
-;
-; Examples:
-;    /README.txt
-;    /Extras/...
-;    /Binaries/ThirdParty/*.dll

AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs

@@ -8,10 +8,10 @@ public class AdvancedSessions : ModuleRules
         PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
         //bEnforceIWYU = true;
 
-        PublicDefinitions.Add("WITH_ADVANCED_SESSIONS=1");
+        Definitions.Add("WITH_ADVANCED_SESSIONS=1");
 
-       // PrivateIncludePaths.AddRange(new string[] { "AdvancedSessions/Private"/*, "OnlineSubsystemSteam/Private"*/ });
-       // PublicIncludePaths.AddRange(new string[] { "AdvancedSessions/Public" });
+        PrivateIncludePaths.AddRange(new string[] { "AdvancedSessions/Private"/*, "OnlineSubsystemSteam/Private"*/ });
+        PublicIncludePaths.AddRange(new string[] { "AdvancedSessions/Public" });
         PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "OnlineSubsystem", "CoreUObject", "OnlineSubsystemUtils", "Networking", "Sockets"/*"Voice", "OnlineSubsystemSteam"*/ });
         PrivateDependencyModuleNames.AddRange(new string[] { "OnlineSubsystem", "Sockets", "Networking", "OnlineSubsystemUtils" /*"Voice", "Steamworks","OnlineSubsystemSteam"*/});
     }

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h

@@ -13,7 +13,7 @@
 //#include "OnlineMessageInterface.h"
 //#include "OnlinePresenceInterface.h"
 //#include "Engine/GameInstance.h"
-#include "Interfaces/OnlineSessionInterface.h"
+#include "OnlineSessionInterface.h"
 
 //#include "UObjectIterator.h"
 

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h

@@ -2,20 +2,19 @@
 
 #pragma once
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
 #include "BlueprintDataDefinitions.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#include "Interfaces/OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
+#include "OnlineFriendsInterface.h"
+#include "OnlineUserInterface.h"
+#include "OnlineMessageInterface.h"
+#include "OnlinePresenceInterface.h"
 #include "Engine/GameInstance.h"
 #include "Engine/LocalPlayer.h"
-#include "Interfaces/OnlineSessionInterface.h"
+#include "OnlineSessionInterface.h"
 #include "OnlineSessionSettings.h"
-#include "UObject/UObjectIterator.h"
+#include "UObjectIterator.h"
 #include "AdvancedFriendsInterface.h"
 
 #include "AdvancedFriendsGameInstance.generated.h"
@@ -66,7 +65,6 @@ public:
 	void OnSessionInviteAcceptedMaster(const bool bWasSuccessful, int32 LocalPlayer, TSharedPtr<const FUniqueNetId> PersonInviting, const FOnlineSessionSearchResult& SessionToJoin);
 
 	// After a session invite has been accepted by the local player this event is triggered, call JoinSession on the session result to join it
-	// This function is currently not hooked up in any of Epics default subsystems, it is here for custom subsystems
 	UFUNCTION(BlueprintImplementableEvent, Category = "AdvancedFriends")
 	void OnSessionInviteAccepted(int32 LocalPlayerNum, FBPUniqueNetId PersonInvited, const FBlueprintSessionResult& SessionToJoin);
 

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h

@@ -5,14 +5,14 @@
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#include "Interfaces/OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
+#include "OnlineFriendsInterface.h"
+#include "OnlineUserInterface.h"
+#include "OnlineMessageInterface.h"
+#include "OnlinePresenceInterface.h"
 #include "Engine/GameInstance.h"
-#include "Interfaces/OnlineSessionInterface.h"
+#include "OnlineSessionInterface.h"
 #include "OnlineSessionSettings.h"
-#include "UObject/UObjectIterator.h"
+#include "UObjectIterator.h"
 #include "BlueprintDataDefinitions.h"
 #include "AdvancedFriendsInterface.generated.h"
 

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h

@@ -7,14 +7,14 @@
 #include "Online.h"
 #include "Engine/LocalPlayer.h"
 #include "OnlineSubsystem.h"
-#include "Interfaces/OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
+#include "OnlineFriendsInterface.h"
+#include "OnlineUserInterface.h"
+#include "OnlineMessageInterface.h"
+#include "OnlinePresenceInterface.h"
 #include "Engine/GameInstance.h"
-#include "Interfaces/OnlineSessionInterface.h"
+#include "OnlineSessionInterface.h"
 
-#include "UObject/UObjectIterator.h"
+#include "UObjectIterator.h"
 
 #include "AdvancedFriendsLibrary.generated.h"
 

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h

@@ -1,71 +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 "GameFramework/PlayerState.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/AdvancedIdentityLibrary.h

@@ -6,13 +6,13 @@
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#include "Interfaces/OnlineIdentityInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
+#include "OnlineIdentityInterface.h"
+#include "OnlineUserInterface.h"
+#include "OnlinePresenceInterface.h"
 #include "Engine/GameInstance.h"
 #include "Engine/LocalPlayer.h"
 
-#include "UObject/UObjectIterator.h"
+#include "UObjectIterator.h"
 
 #include "AdvancedIdentityLibrary.generated.h"
 

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h

@@ -1,6 +1,6 @@
 #pragma once
  
-#include "Modules/ModuleManager.h"
+#include "ModuleManager.h"
 
 class AdvancedSessions : public IModuleInterface
 {

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h

@@ -2,22 +2,18 @@
 
 #pragma once
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
 #include "BlueprintDataDefinitions.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#include "Interfaces/OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
+#include "OnlineFriendsInterface.h"
+#include "OnlineUserInterface.h"
+#include "OnlineMessageInterface.h"
+#include "OnlinePresenceInterface.h"
 #include "Engine/GameInstance.h"
-#include "Interfaces/OnlineSessionInterface.h"
+#include "OnlineSessionInterface.h"
 
-#include "GameFramework/GameModeBase.h"
-#include "GameFramework/GameSession.h"
-
-//#include "UObjectIterator.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);
@@ -91,31 +68,11 @@ public:
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo")
 		static void GetUniqueBuildID(FBlueprintSessionResult SessionResult, int32 &UniqueBuildId);
 
-		
-		// Thanks CriErr for submission
-
-
-		// Get session property Key Name value
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo")
-		static FName GetSessionPropertyKey(const FSessionPropertyKeyPair& SessionProperty);
-		
-		// Find session property by Name
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "Result"))
-		static void FindSessionPropertyByName(const TArray<FSessionPropertyKeyPair>& ExtraSettings, FName SettingsName, EBlueprintResultSwitch &Result, FSessionPropertyKeyPair& OutProperty);
-		
-		// Find session property index by Name
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "Result"))
-		static void FindSessionPropertyIndexByName(const TArray<FSessionPropertyKeyPair>& ExtraSettings, FName SettingName, EBlueprintResultSwitch &Result, int32& OutIndex);
-
-		/// Removed the Index_None part of the last function, that isn't accessible in blueprint, better to return success/failure
-		// End Thanks CriErr :p
-
 		// Get session custom information key/value as Byte (For Enums)
 		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult"))
 		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 +94,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);
 
@@ -160,10 +116,6 @@ public:
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID")
 		static void GetUniqueNetID(APlayerController *PlayerController, FBPUniqueNetId &UniqueNetId);
 
-		// Get the unique net id of a network player attached to the given controller
-		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID")
-		static void GetUniqueNetIdOfSessionOwner(FBlueprintSessionResult SessionResult, FBPUniqueNetId& UniqueNetId);
-
 		// Get the unique net id of a network player who is assigned the the given player state
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID")
 		static void GetUniqueNetIDFromPlayerState(APlayerState *PlayerState, FBPUniqueNetId &UniqueNetId);
@@ -204,10 +156,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/AdvancedVoiceLibrary.h

@@ -6,7 +6,7 @@
 #include "BlueprintDataDefinitions.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#include "Interfaces/VoiceInterface.h"
+#include "VoiceInterface.h"
 //#include "OnlineFriendsInterface.h"
 //#include "OnlineUserInterface.h"
 //#include "OnlineMessageInterface.h"
@@ -14,7 +14,7 @@
 #include "Engine/GameInstance.h"
 //#include "OnlineSessionInterface.h"
 
-#include "UObject/UObjectIterator.h"
+#include "UObjectIterator.h"
 
 #include "AdvancedVoiceLibrary.generated.h"
 
@@ -48,7 +48,6 @@ public:
 	static bool RegisterLocalTalker(uint8 LocalPlayerNum = 0);
 
 	// Registers all signed in players as local talkers
-	// This is already done automatically, only do it manually if you unregistered someone
 	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
 	static void RegisterAllLocalTalkers();
 
@@ -61,7 +60,6 @@ public:
 	static void UnRegisterAllLocalTalkers();
 
 	// Registers a remote player as a talker
-	// This is already done automatically, only do it manually if you unregistered someone
 	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedVoice")
 	static bool RegisterRemoteTalker(const FBPUniqueNetId& UniqueNetId);
 

AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h

@@ -1,55 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "Interfaces/OnlineIdentityInterface.h"
-#include "Engine/LocalPlayer.h"
-#include "AutoLoginUserCallbackProxy.generated.h"
-
-UCLASS(MinimalAPI)
-class UAutoLoginUserCallbackProxy : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-
-	// Called when there is a successful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnSuccess;
-
-	// Called when there is an unsuccessful destroy
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnFailure;
-
-	/**
-	 * Logs the player into the online service using parameters passed on the
-	 * command line. Expects -AUTH_LOGIN=<UserName> -AUTH_PASSWORD=<password>. If either
-	 * are missing, the function returns false and doesn't start the login
-	 * process
-	 *
-	 * @param LocalUserNum the controller number of the associated user
-	 *
-	 */
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedIdentity")
-	static UAutoLoginUserCallbackProxy* AutoLoginUser(UObject* WorldContextObject, int32 LocalUserNum);
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when the operation completes, calls out to the public success/failure callbacks
-	void OnCompleted(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& ErrorVal);
-
-private:
-	// The controller number of the associated user
-	int32 LocalUserNumber;
-
-	// The delegate executed by the online subsystem
-	FOnLoginCompleteDelegate Delegate;
-
-	// Handle to the registered OnDestroySessionComplete delegate
-	FDelegateHandle DelegateHandle;
-
-	// The world context object in which this call is taking place
-	UObject* WorldContextObject;
-};

AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h

@@ -1,18 +1,17 @@
 #pragma once
 #include "CoreMinimal.h"
-//#include "EngineMinimal.h"
+#include "EngineMinimal.h"
 #include "Engine/Engine.h"
 #include "GameFramework/PlayerState.h"
-//#include "Core.h"
-#include "Interfaces/OnlineSessionInterface.h"
+#include "Core.h"
+#include "OnlineSessionInterface.h"
 #include "OnlineSessionSettings.h"
 #include "OnlineDelegateMacros.h"
 #include "OnlineSubsystem.h"
 #include "OnlineSubsystemImpl.h"
 #include "OnlineSubsystemUtils.h"
 #include "OnlineSubsystemUtilsModule.h"
-#include "GameFramework/PlayerController.h"
-#include "Modules/ModuleManager.h"
+#include "ModuleManager.h"
 #include "OnlineSubsystemUtilsClasses.h"
 #include "BlueprintDataDefinitions.generated.h"	
 
@@ -200,17 +199,6 @@ public:
 			return nullptr;
 	}
 
-	// Adding in a compare operator so that std functions will work with this struct
-	FORCEINLINE bool operator==(const FBPUniqueNetId& Other) const
-	{
-		return (IsValid() && Other.IsValid() && (*GetUniqueNetId() == *Other.GetUniqueNetId()));
-	}
-
-	FORCEINLINE bool operator!=(const FBPUniqueNetId& Other) const
-	{
-		return !(IsValid() && Other.IsValid() && (*GetUniqueNetId() == *Other.GetUniqueNetId()));
-	}
-
 	FBPUniqueNetId()
 	{
 		bUseDirectPointer = false;
@@ -251,31 +239,23 @@ struct FBPFriendPresenceInfo
 public:
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsOnline = false;
+		bool bIsOnline;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsPlaying = false;
+		bool bIsPlaying;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsPlayingThisGame = false;
+		bool bIsPlayingThisGame;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bIsJoinable = false;
+		bool bIsJoinable;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		bool bHasVoiceSupport = false;
+		bool bHasVoiceSupport;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-		EBPOnlinePresenceState PresenceState = EBPOnlinePresenceState::Offline;
+		EBPOnlinePresenceState PresenceState;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
 		FString StatusString;
-
-	FBPFriendPresenceInfo()
-	{
-		bIsOnline = false;
-		bIsPlaying = false;
-		bIsPlayingThisGame = false;
-		bIsJoinable = false;
-		bHasVoiceSupport = false;
-		PresenceState = EBPOnlinePresenceState::Offline;
-	}
 };
 
+
+
 USTRUCT(BlueprintType)
 struct FBPFriendInfo
 {
@@ -288,22 +268,15 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
 	FString RealName;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-	EBPOnlinePresenceState OnlineState = EBPOnlinePresenceState::Offline;
+	EBPOnlinePresenceState OnlineState;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
 	FBPUniqueNetId UniqueNetId;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
-	bool bIsPlayingSameGame = false;
+	bool bIsPlayingSameGame;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend")
 	FBPFriendPresenceInfo PresenceInfo;
-
-	FBPFriendInfo()
-	{
-		OnlineState = EBPOnlinePresenceState::Offline;
-		bIsPlayingSameGame = false;
-	}
 };
 
-
 /** The types of comparison operations for a given search query */
 // Used to compare session properties
 UENUM(BlueprintType)
@@ -366,7 +339,7 @@ public:
 		//return const_cast<FUniqueNetId*>(UniqueNetIdPtr);
 		if (APlayerState* PlayerState = (PlayerController != NULL) ? PlayerController->PlayerState : NULL)
 		{
-			UserID = PlayerState->GetUniqueId().GetUniqueNetId();
+			UserID = PlayerState->UniqueId.GetUniqueNetId();
 			if (!UserID.IsValid())
 			{
 				FFrame::KismetExecutionMessage(*FString::Printf(TEXT("%s - Cannot map local player to unique net ID"), FunctionContext), ELogVerbosity::Warning);

AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h

@@ -1,8 +1,7 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 #pragma once
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "Interfaces/OnlineSessionInterface.h"
+#include "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"
 
@@ -19,28 +18,19 @@ class UCreateSessionCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase
 	UPROPERTY(BlueprintAssignable)
 	FEmptyOnlineDelegate OnFailure;
 
-	/**
-	 *    Creates a session with the default online subsystem with advanced optional inputs, for dedicated servers leave UsePresence as false and set IsDedicatedServer to true. Dedicated servers don't use presence.
-	 *    @param PublicConnections	When doing a 'listen' server, this must be >=2 (ListenServer itself counts as a connection)
-	 *    @param bUseLAN			When you want to play LAN, the level to play on must be loaded with option 'bIsLanMatch'
-	 *    @param bUsePresence		Must be true for a 'listen' server (Map must be loaded with option 'listen'), false for a 'dedicated' server.
-	 *	  @param bUseLobbiesIfAvailable Used to flag the subsystem to use a lobby api instead of general hosting if the API supports it, generally true on steam for listen servers and false for dedicated
-	 *	  @param bShouldAdvertise	Set to true when the OnlineSubsystem should list your server when someone is searching for servers. Otherwise the server is hidden and only join via invite is possible.
-	 *	  @param bUseLobbiesVoiceChatIfAvailable Set to true to setup voice chat lobbies if the API supports it
-	 * 	  @param bStartAfterCreate Set to true to start the session after it's created. If false you need to manually call StartSession when ready.
-	 */
+	// Creates a session with the default online subsystem with advanced optional inputs, for dedicated servers leave UsePresence as false and set IsDedicatedServer to true. Dedicated servers don't use presence.
 	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject",AutoCreateRefTerm="ExtraSettings"), Category = "Online|AdvancedSessions")
-		static UCreateSessionCallbackProxyAdvanced* CreateAdvancedSession(UObject* WorldContextObject, const TArray<FSessionPropertyKeyPair>& ExtraSettings, class APlayerController* PlayerController = NULL, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = true, bool bIsDedicatedServer = false, bool bUsePresence = true, bool bUseLobbiesIfAvailable = true, bool bAllowJoinViaPresence = true, bool bAllowJoinViaPresenceFriendsOnly = false, bool bAntiCheatProtected = false, bool bUsesStats = false, bool bShouldAdvertise = true, bool bUseLobbiesVoiceChatIfAvailable = false, bool bStartAfterCreate = true);
+	static UCreateSessionCallbackProxyAdvanced* CreateAdvancedSession(UObject* WorldContextObject, const TArray<FSessionPropertyKeyPair> &ExtraSettings, class APlayerController* PlayerController = NULL, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = true, bool bIsDedicatedServer = false, bool bUsePresence = true, bool bAllowJoinViaPresence = true, bool bAllowJoinViaPresenceFriendsOnly = false, bool bAntiCheatProtected = false, bool bUsesStats = false, bool bShouldAdvertise = true);
 
 	// UOnlineBlueprintCallProxyBase interface
 	virtual void Activate() override;
 	// End of UOnlineBlueprintCallProxyBase interface
 
 private:
-	// Internal callback when session creation completes, optionally calls StartSession
+	// Internal callback when session creation completes, calls StartSession
 	void OnCreateCompleted(FName SessionName, bool bWasSuccessful);
 
-	// Internal callback when session start completes
+	// Internal callback when session creation completes, calls StartSession
 	void OnStartCompleted(FName SessionName, bool bWasSuccessful);
 
 	// The player controller triggering things
@@ -74,9 +64,6 @@ private:
 	// Whether to use the presence option
 	bool bUsePresence;
 
-	// Whether to prefer the use of lobbies for hosting if the api supports them
-	bool bUseLobbiesIfAvailable;
-
 	// Whether to allow joining via presence
 	bool bAllowJoinViaPresence;
 
@@ -92,12 +79,6 @@ private:
 	// Should advertise server?
 	bool bShouldAdvertise;
 
-	// Whether to prefer the use of voice chat lobbies if the api supports them
-	bool bUseLobbiesVoiceChatIfAvailable;
-
-	// Whether to start the session automatically after it is created
-	bool bStartAfterCreate;
-
 	// Store extra settings
 	TArray<FSessionPropertyKeyPair> ExtraSettings;
 

AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h

@@ -1,8 +1,7 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 #pragma once
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "Interfaces/OnlineSessionInterface.h"
+#include "OnlineSessionInterface.h"
 #include "BlueprintDataDefinitions.h"
 #include "EndSessionCallbackProxy.generated.h"
 
@@ -19,11 +18,8 @@ class UEndSessionCallbackProxy : public UOnlineBlueprintCallProxyBase
 	UPROPERTY(BlueprintAssignable)
 	FEmptyOnlineDelegate OnFailure;
 
-	/**
-	 *	  Ends the current sessions, Generally for almost all uses you should be using the engines native Destroy Session node instead.
-	 *	  This exists for people using StartSession and optionally hand managing the session state.
-	 */
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedSessions")
+	// Ends the current session
+	UFUNCTION(BlueprintCallable, meta=(DeprecatedFunction,DeprecationMessage = "This function is deprecated, I realized that people have been using it wrong and it doesn't have much use in blueprints. Use Destroy Session only instead.",BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedSessions|Deprecated")
 	static UEndSessionCallbackProxy* EndSession(UObject* WorldContextObject, class APlayerController* PlayerController);
 
 	// UOnlineBlueprintCallProxyBase interface

AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h

@@ -1,8 +1,7 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 #pragma once
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
-#include "Interfaces/OnlineSessionInterface.h"
+#include "OnlineSessionInterface.h"
 #include "FindSessionsCallbackProxy.h"
 #include "BlueprintDataDefinitions.h"
 #include "FindSessionsCallbackProxyAdvanced.generated.h"
@@ -22,7 +21,7 @@ class UFindSessionsCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase
 
 	// Searches for advertised sessions with the default online subsystem and includes an array of filters
 	UFUNCTION(BlueprintCallable, meta = (BlueprintInternalUseOnly = "true", WorldContext = "WorldContextObject", AutoCreateRefTerm="Filters"), Category = "Online|AdvancedSessions")
-	static UFindSessionsCallbackProxyAdvanced* FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int32 MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray<FSessionsSearchSetting> &Filters, bool bEmptyServersOnly = false, bool bNonEmptyServersOnly = false, bool bSecureServersOnly = false, bool bSearchLobbies = true, int MinSlotsAvailable = 0);
+	static UFindSessionsCallbackProxyAdvanced* FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int32 MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray<FSessionsSearchSetting> &Filters, bool bEmptyServersOnly = false, bool bNonEmptyServersOnly = false, bool bSecureServersOnly = false, int MinSlotsAvailable = 0);
 
 	static bool CompareVariants(const FVariantData &A, const FVariantData &B, EOnlineComparisonOpRedux Comparator);
 	
@@ -92,9 +91,6 @@ private:
 	// Search for secure servers only
 	bool bSecureServersOnly;
 
-	// Search through lobbies
-	bool bSearchLobbies;
-
 	// Min slots requires to search
 	int MinSlotsAvailable;
 

AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h

@@ -3,7 +3,7 @@
 
 #include "CoreMinimal.h"
 #include "BlueprintDataDefinitions.h"
-#include "Interfaces/OnlineIdentityInterface.h"
+#include "OnlineIdentityInterface.h"
 #include "GetUserPrivilegeCallbackProxy.generated.h"
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FBlueprintGetUserPrivilegeDelegate,/* const &FBPUniqueNetId, PlayerID,*/ EBPUserPrivileges, QueriedPrivilege, bool, HadPrivilege);
@@ -21,7 +21,7 @@ class UGetUserPrivilegeCallbackProxy : public UOnlineBlueprintCallProxyBase
 	UPROPERTY(BlueprintAssignable)
 	FEmptyOnlineDelegate OnFailure;
 
-	// Gets the privilage of the user
+	// Logs out of the identity interface
 	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedIdentity")
 	static UGetUserPrivilegeCallbackProxy* GetUserPrivilege(UObject* WorldContextObject, const EBPUserPrivileges & PrivilegeToCheck, const FBPUniqueNetId & PlayerUniqueNetID);
 

AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h

@@ -3,7 +3,7 @@
 
 #include "CoreMinimal.h"
 #include "BlueprintDataDefinitions.h"
-#include "Interfaces/OnlineIdentityInterface.h"
+#include "OnlineIdentityInterface.h"
 #include "Engine/LocalPlayer.h"
 #include "LoginUserCallbackProxy.generated.h"
 
@@ -20,9 +20,9 @@ class ULoginUserCallbackProxy : public UOnlineBlueprintCallProxyBase
 	UPROPERTY(BlueprintAssignable)
 	FEmptyOnlineDelegate OnFailure;
 
-	// Logs into the identity interface
-	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject", AdvancedDisplay = "AuthType"), Category = "Online|AdvancedIdentity")
-	static ULoginUserCallbackProxy* LoginUser(UObject* WorldContextObject, class APlayerController* PlayerController, FString UserID, FString UserToken, FString AuthType);
+	// Logs out of the identity interface
+	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|AdvancedIdentity")
+	static ULoginUserCallbackProxy* LoginUser(UObject* WorldContextObject, class APlayerController* PlayerController, FString UserID, FString UserToken);
 
 	// UOnlineBlueprintCallProxyBase interface
 	virtual void Activate() override;
@@ -42,8 +42,6 @@ private:
 	// The user pass / token
 	FString UserToken;
 
-	FString AuthType;
-
 	// The delegate executed by the online subsystem
 	FOnLoginCompleteDelegate Delegate;
 

AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h

@@ -3,7 +3,7 @@
 
 #include "CoreMinimal.h"
 #include "BlueprintDataDefinitions.h"
-#include "Interfaces/OnlineIdentityInterface.h"
+#include "OnlineIdentityInterface.h"
 #include "Engine/LocalPlayer.h"
 #include "LogoutUserCallbackProxy.generated.h"
 

AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h

@@ -1,46 +0,0 @@
-#pragma once
-
-#include "CoreMinimal.h"
-#include "BlueprintDataDefinitions.h"
-#include "StartSessionCallbackProxyAdvanced.generated.h"
-
-UCLASS(MinimalAPI)
-class UStartSessionCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase
-{
-	GENERATED_UCLASS_BODY()
-	// Called when the session starts successfully
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnSuccess;
-
-	// Called when there is an error starting the session
-	UPROPERTY(BlueprintAssignable)
-	FEmptyOnlineDelegate OnFailure;
-
-	/**
-	 * Starts a session with the default online subsystem. The session needs to be previously created by calling the "CreateAdvancedSession" node.
-	 * @param WorldContextObject
-	 */
-	UFUNCTION(
-		BlueprintCallable
-		, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject")
-		, Category = "Online|AdvancedSessions"
-	)
-	static UStartSessionCallbackProxyAdvanced* StartAdvancedSession(const UObject* WorldContextObject);
-
-	// UOnlineBlueprintCallProxyBase interface
-	virtual void Activate() override;
-	// End of UOnlineBlueprintCallProxyBase interface
-
-private:
-	// Internal callback when session start completes
-	void OnStartCompleted(FName SessionName, bool bWasSuccessful);
-
-	// The delegate executed by the online subsystem
-	FOnStartSessionCompleteDelegate StartCompleteDelegate;
-
-	// Handles to the registered delegates above
-	FDelegateHandle StartCompleteDelegateHandle;
-
-	// The world context object in which this call is taking place
-	const UObject* WorldContextObject;
-};

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

@@ -1,7 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 #include "AdvancedFriendsGameInstance.h"
-#include "Kismet/GameplayStatics.h"
-#include "GameFramework/PlayerController.h"
 
 //General Log
 DEFINE_LOG_CATEGORY(AdvancedFriendsInterfaceLog);
@@ -22,7 +20,7 @@ UAdvancedFriendsGameInstance::UAdvancedFriendsGameInstance(const FObjectInitiali
 
 void UAdvancedFriendsGameInstance::Shutdown()
 {
-	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld());
+	IOnlineSessionPtr SessionInterface = Online::GetSessionInterface();
 	
 	if (!SessionInterface.IsValid())
 	{
@@ -39,7 +37,7 @@ void UAdvancedFriendsGameInstance::Shutdown()
 
 	if (bEnableTalkingStatusDelegate)
 	{
-		IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface(GetWorld());
+		IOnlineVoicePtr VoiceInterface = Online::GetVoiceInterface();
 
 		if (VoiceInterface.IsValid())
 		{
@@ -52,7 +50,7 @@ void UAdvancedFriendsGameInstance::Shutdown()
 		}
 	}
 
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(GetWorld());
+	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface();
 
 	if (IdentityInterface.IsValid())
 	{
@@ -69,7 +67,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 +88,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 +101,7 @@ void UAdvancedFriendsGameInstance::Init()
 		}
 	}
 
-	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface(GetWorld());
+	IOnlineIdentityPtr IdentityInterface = Online::GetIdentityInterface();
 
 	if (IdentityInterface.IsValid())
 	{
@@ -263,7 +261,7 @@ void UAdvancedFriendsGameInstance::OnSessionInviteReceivedMaster(const FUniqueNe
 		int32 LocalPlayer = 0;
 		for (int i = 0; i < PlayerList.Num(); i++)
 		{
-			if (*PlayerList[i]->PlayerState->GetUniqueId().GetUniqueNetId() == PersonInvited)
+			if (*PlayerList[i]->PlayerState->UniqueId.GetUniqueNetId() == PersonInvited)
 			{
 				LocalPlayer = i;
 				Player = PlayerList[i];

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();
@@ -98,31 +22,6 @@ void UAdvancedSessionsLibrary::GetUniqueBuildID(FBlueprintSessionResult SessionR
 	UniqueBuildId = SessionResult.OnlineResult.Session.SessionSettings.BuildUniqueId;
 }
 
-FName UAdvancedSessionsLibrary::GetSessionPropertyKey(const FSessionPropertyKeyPair& SessionProperty)
-{
-	return SessionProperty.Key;
-}
-
-void UAdvancedSessionsLibrary::FindSessionPropertyByName(const TArray<FSessionPropertyKeyPair>& ExtraSettings, FName SettingName, EBlueprintResultSwitch &Result, FSessionPropertyKeyPair& OutProperty)
-{
-	const FSessionPropertyKeyPair* prop = ExtraSettings.FindByPredicate([&](const FSessionPropertyKeyPair& it) {return it.Key == SettingName; });
-	if (prop)
-	{
-		Result = EBlueprintResultSwitch::OnSuccess;
-		OutProperty = *prop;
-		return;
-	}
-
-	Result = EBlueprintResultSwitch::OnFailure;
-}
-
-void UAdvancedSessionsLibrary::FindSessionPropertyIndexByName(const TArray<FSessionPropertyKeyPair>& ExtraSettings, FName SettingName, EBlueprintResultSwitch &Result, int32& OutIndex)
-{
-	OutIndex = ExtraSettings.IndexOfByPredicate([&](const FSessionPropertyKeyPair& it) {return it.Key == SettingName; });
-
-	Result = OutIndex != INDEX_NONE ? EBlueprintResultSwitch::OnSuccess : EBlueprintResultSwitch::OnFailure;
-}	
-
 void UAdvancedSessionsLibrary::AddOrModifyExtraSettings(UPARAM(ref) TArray<FSessionPropertyKeyPair> & SettingsArray, UPARAM(ref) TArray<FSessionPropertyKeyPair> & NewOrChangedSettings, TArray<FSessionPropertyKeyPair> & ModifiedSettingsArray)
 {
 	ModifiedSettingsArray = SettingsArray;
@@ -163,10 +62,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 +72,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 +86,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 +115,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 +126,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)
@@ -442,7 +338,7 @@ void UAdvancedSessionsLibrary::GetUniqueNetID(APlayerController *PlayerControlle
 
 	if (APlayerState* PlayerState = (PlayerController != NULL) ? PlayerController->PlayerState : NULL)
 	{
-		UniqueNetId.SetUniqueNetId(PlayerState->GetUniqueId().GetUniqueNetId());
+		UniqueNetId.SetUniqueNetId(PlayerState->UniqueId.GetUniqueNetId());
 		if (!UniqueNetId.IsValid())
 		{
 			UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetUniqueNetIdFromController couldn't get the player uniquenetid!"));
@@ -451,17 +347,6 @@ void UAdvancedSessionsLibrary::GetUniqueNetID(APlayerController *PlayerControlle
 	}
 }
 
-void UAdvancedSessionsLibrary::GetUniqueNetIdOfSessionOwner(FBlueprintSessionResult SessionResult, FBPUniqueNetId& UniqueNetId)
-{
-	FBPUniqueNetId ReturnID;
-	if (SessionResult.OnlineResult.IsValid())
-	{
-		ReturnID.SetUniqueNetId(SessionResult.OnlineResult.Session.OwningUserId);
-	}
-
-	UniqueNetId = ReturnID;
-}
-
 void UAdvancedSessionsLibrary::GetUniqueNetIDFromPlayerState(APlayerState *PlayerState, FBPUniqueNetId &UniqueNetId)
 {
 	if (!PlayerState)
@@ -470,7 +355,7 @@ void UAdvancedSessionsLibrary::GetUniqueNetIDFromPlayerState(APlayerState *Playe
 		return;
 	}
 
-	UniqueNetId.SetUniqueNetId(PlayerState->GetUniqueId().GetUniqueNetId());
+	UniqueNetId.SetUniqueNetId(PlayerState->UniqueId.GetUniqueNetId());
 	if (!UniqueNetId.IsValid())
 	{
 		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetUniqueNetIdFromPlayerState couldn't get the player uniquenetid!"));
@@ -517,7 +402,7 @@ void UAdvancedSessionsLibrary::GetPlayerName(APlayerController *PlayerController
 
 	if (APlayerState* PlayerState = (PlayerController != NULL) ? PlayerController->PlayerState : NULL)
 	{
-		PlayerName = PlayerState->GetPlayerName();
+		PlayerName = PlayerState->PlayerName;
 		return;
 	}
 	else
@@ -528,31 +413,23 @@ void UAdvancedSessionsLibrary::GetPlayerName(APlayerController *PlayerController
 
 void UAdvancedSessionsLibrary::GetNumberOfNetworkPlayers(UObject* WorldContextObject, int32 &NumNetPlayers)
 {
+	//Get an actor to GetWorld() from
+	/*TObjectIterator<AActor> Itr;
+	if (!Itr)
+	{
+		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetNumberOfNetworkPlayers Failed to get iterator!"));
+		return;
+	}*/
+	//~~~~~~~~~~~~
+
 	//Get World
-	UWorld* TheWorld = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull);
+	UWorld* TheWorld = GEngine->GetWorldFromContextObject(WorldContextObject);
 
 	if (!TheWorld)
 	{
 		UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetNumberOfNetworkPlayers Failed to get World()!"));
 		return;
 	}
-
-	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 World->ServerTravel(FURL, bAbsolute, bShouldSkipGameNotify);
-	}
-
-	return false;
+	TArray<class APlayerState*>& PlayerArray = (TheWorld->GetGameState()->PlayerArray);
+	NumNetPlayers = PlayerArray.Num();
 }

AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp

@@ -1,74 +0,0 @@
-// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
-
-#include "AutoLoginUserCallbackProxy.h"
-#include "Kismet/GameplayStatics.h"
-
-//////////////////////////////////////////////////////////////////////////
-// ULoginUserCallbackProxy
-
-UAutoLoginUserCallbackProxy::UAutoLoginUserCallbackProxy(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	, Delegate(FOnLoginCompleteDelegate::CreateUObject(this, &ThisClass::OnCompleted))
-{
-}
-
-UAutoLoginUserCallbackProxy* UAutoLoginUserCallbackProxy::AutoLoginUser(UObject* WorldContextObject, int32 LocalUserNum)
-{
-	UAutoLoginUserCallbackProxy* Proxy = NewObject<UAutoLoginUserCallbackProxy>();
-	Proxy->LocalUserNumber = LocalUserNum;
-	Proxy->WorldContextObject = WorldContextObject;
-	return Proxy;
-}
-
-void UAutoLoginUserCallbackProxy::Activate()
-{
-	auto Identity = Online::GetIdentityInterface();
-
-	if (Identity.IsValid())
-	{
-		DelegateHandle = Identity->AddOnLoginCompleteDelegate_Handle(LocalUserNumber, Delegate);
-		Identity->AutoLogin(LocalUserNumber);
-		return;
-	}
-
-	// Fail immediately
-	OnFailure.Broadcast();
-}
-
-void UAutoLoginUserCallbackProxy::OnCompleted(int32 LocalUserNum, bool bWasSuccessful, const FUniqueNetId& UserId, const FString& ErrorVal)
-{
-	auto Identity = Online::GetIdentityInterface();
-
-	if (Identity.IsValid())
-	{
-		Identity->ClearOnLoginCompleteDelegate_Handle(LocalUserNum, DelegateHandle);
-	}
-
-	if(APlayerController* PController = UGameplayStatics::GetPlayerController(WorldContextObject->GetWorld(), LocalUserNum))
-	{
-		ULocalPlayer* Player = Cast<ULocalPlayer>(PController->Player);
-
-		FUniqueNetIdRepl uniqueId(UserId.AsShared());
-
-		if (Player)
-		{
-			Player->SetCachedUniqueNetId(uniqueId);
-		}
-
-		if (APlayerState* State = PController->PlayerState)
-		{
-			// Update UniqueId. See also ShowLoginUICallbackProxy.cpp
-			State->SetUniqueId(uniqueId);
-		}
-	}
-
-
-	if (bWasSuccessful)
-	{
-		OnSuccess.Broadcast();
-	}
-	else
-	{
-		OnFailure.Broadcast();
-	}
-}

AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp

@@ -1,4 +1,5 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
+
 #include "CancelFindSessionsCallbackProxy.h"
 
 
@@ -21,7 +22,7 @@ UCancelFindSessionsCallbackProxy* UCancelFindSessionsCallbackProxy::CancelFindSe
 
 void UCancelFindSessionsCallbackProxy::Activate()
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CancelFindSessions"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CancelFindSessions"), GEngine->GetWorldFromContextObject(WorldContextObject));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
 
 	if (Helper.IsValid())
@@ -47,7 +48,7 @@ void UCancelFindSessionsCallbackProxy::Activate()
 
 void UCancelFindSessionsCallbackProxy::OnCompleted(bool bWasSuccessful)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CancelFindSessionsCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CancelFindSessionsCallback"), GEngine->GetWorldFromContextObject(WorldContextObject));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
 
 	if (Helper.IsValid())

AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp

@@ -13,7 +13,7 @@ UCreateSessionCallbackProxyAdvanced::UCreateSessionCallbackProxyAdvanced(const F
 {
 }
 
-UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::CreateAdvancedSession(UObject* WorldContextObject, const TArray<FSessionPropertyKeyPair>& ExtraSettings, class APlayerController* PlayerController, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bIsDedicatedServer, bool bUsePresence, bool bUseLobbiesIfAvailable, bool bAllowJoinViaPresence, bool bAllowJoinViaPresenceFriendsOnly, bool bAntiCheatProtected, bool bUsesStats, bool bShouldAdvertise, bool bUseLobbiesVoiceChatIfAvailable, bool bStartAfterCreate)
+UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::CreateAdvancedSession(UObject* WorldContextObject, const TArray<FSessionPropertyKeyPair> &ExtraSettings, class APlayerController* PlayerController, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bIsDedicatedServer, bool bUsePresence, bool bAllowJoinViaPresence, bool bAllowJoinViaPresenceFriendsOnly, bool bAntiCheatProtected, bool bUsesStats, bool bShouldAdvertise)
 {
 	UCreateSessionCallbackProxyAdvanced* Proxy = NewObject<UCreateSessionCallbackProxyAdvanced>();
 	Proxy->PlayerControllerWeakPtr = PlayerController;
@@ -25,20 +25,17 @@ UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::Create
 	Proxy->ExtraSettings = ExtraSettings;
 	Proxy->bDedicatedServer = bIsDedicatedServer;
 	Proxy->bUsePresence = bUsePresence;
-	Proxy->bUseLobbiesIfAvailable = bUseLobbiesIfAvailable;
 	Proxy->bAllowJoinViaPresence = bAllowJoinViaPresence;
 	Proxy->bAllowJoinViaPresenceFriendsOnly = bAllowJoinViaPresenceFriendsOnly;
 	Proxy->bAntiCheatProtected = bAntiCheatProtected;
 	Proxy->bUsesStats = bUsesStats;
 	Proxy->bShouldAdvertise = bShouldAdvertise;
-	Proxy->bUseLobbiesVoiceChatIfAvailable = bUseLobbiesVoiceChatIfAvailable;
-	Proxy->bStartAfterCreate = bStartAfterCreate;
 	return Proxy;
 }
 
 void UCreateSessionCallbackProxyAdvanced::Activate()
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CreateSession"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CreateSession"), GEngine->GetWorldFromContextObject(WorldContextObject));
 	
 	if (PlayerControllerWeakPtr.IsValid() )
 		Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
@@ -53,27 +50,21 @@ void UCreateSessionCallbackProxyAdvanced::Activate()
 			FOnlineSessionSettings Settings;
 			Settings.NumPublicConnections = NumPublicConnections;
 			Settings.NumPrivateConnections = NumPrivateConnections;
-			Settings.bShouldAdvertise = bShouldAdvertise;
+			Settings.bShouldAdvertise = true;
 			Settings.bAllowJoinInProgress = true;
 			Settings.bIsLANMatch = bUseLAN;
-			Settings.bAllowJoinViaPresence = bAllowJoinViaPresence;
+			Settings.bAllowJoinViaPresence = true;
 			Settings.bIsDedicated = bDedicatedServer;
 
 			if (bDedicatedServer)
-			{
 				Settings.bUsesPresence = false;
-				Settings.bUseLobbiesIfAvailable = false;
-			}
 			else
-			{
 				Settings.bUsesPresence = bUsePresence;
-				Settings.bUseLobbiesIfAvailable = bUseLobbiesIfAvailable;
-			}
 
-			Settings.bUseLobbiesVoiceChatIfAvailable = bUseLobbiesIfAvailable ? bUseLobbiesVoiceChatIfAvailable : false;
 			Settings.bAllowJoinViaPresenceFriendsOnly = bAllowJoinViaPresenceFriendsOnly;
 			Settings.bAntiCheatProtected = bAntiCheatProtected;
 			Settings.bUsesStats = bUsesStats;
+			Settings.bShouldAdvertise = bShouldAdvertise;
 
 			// These are about the only changes over the standard Create Sessions Node
 			Settings.bAllowInvites = bAllowInvites;
@@ -88,23 +79,10 @@ void UCreateSessionCallbackProxyAdvanced::Activate()
 			}
 			
 			
-			if (!bDedicatedServer )
-			{
-				if (PlayerControllerWeakPtr.IsValid() && Helper.UserID.IsValid())
-				{
-					Sessions->CreateSession(*Helper.UserID, NAME_GameSession, Settings);
-				}
-				else
-				{
-					FFrame::KismetExecutionMessage(TEXT("Invalid Player controller when attempting to start a session"), ELogVerbosity::Warning);
-					Sessions->ClearOnCreateSessionCompleteDelegate_Handle(CreateCompleteDelegateHandle);
-					
-					// Fail immediately
-					OnFailure.Broadcast();
-				}
-			}
+			if (!bDedicatedServer && PlayerControllerWeakPtr.IsValid() && Helper.UserID.IsValid())
+				Sessions->CreateSession(*Helper.UserID, GameSessionName, Settings);
 			else
-				Sessions->CreateSession(0, NAME_GameSession, Settings);
+				Sessions->CreateSession(0, GameSessionName, Settings);
 
 			// OnCreateCompleted will get called, nothing more to do now
 			return;
@@ -121,7 +99,7 @@ void UCreateSessionCallbackProxyAdvanced::Activate()
 
 void UCreateSessionCallbackProxyAdvanced::OnCreateCompleted(FName SessionName, bool bWasSuccessful)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CreateSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("CreateSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject));
 	//Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
 
 	if (Helper.OnlineSub != nullptr)
@@ -133,17 +111,8 @@ void UCreateSessionCallbackProxyAdvanced::OnCreateCompleted(FName SessionName, b
 			
 			if (bWasSuccessful)
 			{
-				if (this->bStartAfterCreate)
-				{
-					UE_LOG_ONLINE_SESSION(Display, TEXT("Session creation completed. Automatic start is turned on, starting session now."));
-					StartCompleteDelegateHandle = Sessions->AddOnStartSessionCompleteDelegate_Handle(StartCompleteDelegate);
-					Sessions->StartSession(NAME_GameSession); // We'll call `OnSuccess.Broadcast()` when start succeeds.
-				}
-				else
-				{
-					UE_LOG_ONLINE_SESSION(Display, TEXT("Session creation completed. Automatic start is turned off, to start the session call 'StartSession'."));
-					OnSuccess.Broadcast();
-				}
+				StartCompleteDelegateHandle = Sessions->AddOnStartSessionCompleteDelegate_Handle(StartCompleteDelegate);
+				Sessions->StartSession(GameSessionName);
 
 				// OnStartCompleted will get called, nothing more to do now
 				return;
@@ -159,8 +128,8 @@ void UCreateSessionCallbackProxyAdvanced::OnCreateCompleted(FName SessionName, b
 
 void UCreateSessionCallbackProxyAdvanced::OnStartCompleted(FName SessionName, bool bWasSuccessful)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("StartSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
-	//Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("StartSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject));
+	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
 
 	if (Helper.OnlineSub != nullptr)
 	{

AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp

@@ -1,4 +1,5 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
+
 #include "EndSessionCallbackProxy.h"
 
 
@@ -21,7 +22,7 @@ UEndSessionCallbackProxy* UEndSessionCallbackProxy::EndSession(UObject* WorldCon
 
 void UEndSessionCallbackProxy::Activate()
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSession"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSession"), GEngine->GetWorldFromContextObject(WorldContextObject));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
 
 	if (Helper.IsValid())
@@ -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
 			{
@@ -55,7 +56,7 @@ void UEndSessionCallbackProxy::Activate()
 
 void UEndSessionCallbackProxy::OnCompleted(FName SessionName, bool bWasSuccessful)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("EndSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
 
 	if (Helper.IsValid())

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"
 
 
@@ -15,7 +16,7 @@ UFindSessionsCallbackProxyAdvanced::UFindSessionsCallbackProxyAdvanced(const FOb
 	bIsOnSecondSearch = false;
 }
 
-UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray<FSessionsSearchSetting> &Filters, bool bEmptyServersOnly, bool bNonEmptyServersOnly, bool bSecureServersOnly, bool bSearchLobbies, int MinSlotsAvailable)
+UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray<FSessionsSearchSetting> &Filters, bool bEmptyServersOnly, bool bNonEmptyServersOnly, bool bSecureServersOnly, int MinSlotsAvailable)
 {
 	UFindSessionsCallbackProxyAdvanced* Proxy = NewObject<UFindSessionsCallbackProxyAdvanced>();	
 	Proxy->PlayerControllerWeakPtr = PlayerController;
@@ -27,14 +28,13 @@ UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSess
 	Proxy->bEmptyServersOnly = bEmptyServersOnly,
 	Proxy->bNonEmptyServersOnly = bNonEmptyServersOnly;
 	Proxy->bSecureServersOnly = bSecureServersOnly;
-	Proxy->bSearchLobbies = bSearchLobbies;
 	Proxy->MinSlotsAvailable = MinSlotsAvailable;
 	return Proxy;
 }
 
 void UFindSessionsCallbackProxyAdvanced::Activate()
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("FindSessions"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("FindSessions"), GEngine->GetWorldFromContextObject(WorldContextObject));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
 
 	if (Helper.IsValid())
@@ -74,17 +74,6 @@ void UFindSessionsCallbackProxyAdvanced::Activate()
 			#define SEARCH_USER FName(TEXT("SEARCHUSER"))
 			// Keywords to match in session search
 			#define SEARCH_KEYWORDS FName(TEXT("SEARCHKEYWORDS"))*/
-			/** Keywords to match in session search */
-			/** The matchmaking queue name to matchmake in, e.g. "TeamDeathmatch" (value is string) */
-			/** #define SEARCH_MATCHMAKING_QUEUE FName(TEXT("MATCHMAKINGQUEUE"))*/
-			/** If set, use the named Xbox Live hopper to find a session via matchmaking (value is a string) */
-			/** #define SEARCH_XBOX_LIVE_HOPPER_NAME FName(TEXT("LIVEHOPPERNAME"))*/
-			/** Which session template from the service configuration to use */
-			/** #define SEARCH_XBOX_LIVE_SESSION_TEMPLATE_NAME FName(TEXT("LIVESESSIONTEMPLATE"))*/
-			/** Selection method used to determine which match to join when multiple are returned (valid only on Switch) */
-			/** #define SEARCH_SWITCH_SELECTION_METHOD FName(TEXT("SWITCHSELECTIONMETHOD"))*/
-			/** Whether to use lobbies vs sessions */
-			/** #define SEARCH_LOBBIES FName(TEXT("LOBBYSEARCH"))*/
 
 			if (bEmptyServersOnly)
 				tem.Set(SEARCH_EMPTY_SERVERS_ONLY, true, EOnlineComparisonOp::Equals);
@@ -98,6 +87,8 @@ void UFindSessionsCallbackProxyAdvanced::Activate()
 			if (MinSlotsAvailable != 0)
 				tem.Set(SEARCH_MINSLOTSAVAILABLE, MinSlotsAvailable, EOnlineComparisonOp::GreaterThanEquals);
 
+
+
 			// Filter results
 			if (SearchSettings.Num() > 0)
 			{
@@ -114,9 +105,6 @@ void UFindSessionsCallbackProxyAdvanced::Activate()
 			case EBPServerPresenceSearchType::ClientServersOnly:
 			{
 				tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals);
-
-				if (bSearchLobbies)
-					tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals);
 			}
 			break;
 
@@ -129,24 +117,21 @@ void UFindSessionsCallbackProxyAdvanced::Activate()
 			case EBPServerPresenceSearchType::AllServers:
 			default:
 			{
-				//if (IOnlineSubsystem::DoesInstanceExist("STEAM"))
-				//{
-				bRunSecondSearch = true;
+				// Only steam uses the separate searching flags currently
+				if (IOnlineSubsystem::DoesInstanceExist("STEAM"))
+				{
+					bRunSecondSearch = true;
 
-				SearchObjectDedicated = MakeShareable(new FOnlineSessionSearch);
-				SearchObjectDedicated->MaxSearchResults = MaxResults;
-				SearchObjectDedicated->bIsLanQuery = bUseLAN;
+					SearchObjectDedicated = MakeShareable(new FOnlineSessionSearch);
+					SearchObjectDedicated->MaxSearchResults = MaxResults;
+					SearchObjectDedicated->bIsLanQuery = bUseLAN;
 
-				FOnlineSearchSettingsEx DedicatedOnly = tem;
+					FOnlineSearchSettingsEx DedicatedOnly = tem;
+					tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals);
 
-				tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals);
-
-				if (bSearchLobbies)
-					tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals);
-
-				//DedicatedOnly.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals);
-				SearchObjectDedicated->QuerySettings = DedicatedOnly;
-				//}
+					//DedicatedOnly.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals);
+					SearchObjectDedicated->QuerySettings = DedicatedOnly;
+				}
 			}
 			break;
 			}
@@ -171,7 +156,7 @@ void UFindSessionsCallbackProxyAdvanced::Activate()
 
 void UFindSessionsCallbackProxyAdvanced::OnCompleted(bool bSuccess)
 {
-	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("FindSessionsCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
+	FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("FindSessionsCallback"), GEngine->GetWorldFromContextObject(WorldContextObject));
 	Helper.QueryIDFromPlayerController(PlayerControllerWeakPtr.Get());
 
 	if (!bRunSecondSearch && Helper.IsValid())
@@ -240,20 +225,13 @@ void UFindSessionsCallbackProxyAdvanced::OnCompleted(bool bSuccess)
 		}
 	}
 
-	if (Helper.IsValid() && bRunSecondSearch && ServerSearchType == EBPServerPresenceSearchType::AllServers)
+	if (bRunSecondSearch && ServerSearchType == EBPServerPresenceSearchType::AllServers)
 	{
 		bRunSecondSearch = false;
 		bIsOnSecondSearch = true;
 		auto Sessions = Helper.OnlineSub->GetSessionInterface();
 		Sessions->FindSessions(*Helper.UserID, SearchObjectDedicated.ToSharedRef());
 	}
-	else // We lost our player controller
-	{
-		if (bSuccess && SessionSearchResults.Num() > 0)
-			OnSuccess.Broadcast(SessionSearchResults);
-		else
-			OnFailure.Broadcast(SessionSearchResults);
-	}
 }
 
 

AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp

@@ -12,13 +12,12 @@ ULoginUserCallbackProxy::ULoginUserCallbackProxy(const FObjectInitializer& Objec
 {
 }
 
-ULoginUserCallbackProxy* ULoginUserCallbackProxy::LoginUser(UObject* WorldContextObject, class APlayerController* PlayerController, FString UserID, FString UserToken, FString AuthType)
+ULoginUserCallbackProxy* ULoginUserCallbackProxy::LoginUser(UObject* WorldContextObject, class APlayerController* PlayerController, FString UserID, FString UserToken)
 {
 	ULoginUserCallbackProxy* Proxy = NewObject<ULoginUserCallbackProxy>();
 	Proxy->PlayerControllerWeakPtr = PlayerController;
 	Proxy->UserID = UserID;
 	Proxy->UserToken = UserToken;
-	Proxy->AuthType = AuthType;
 	Proxy->WorldContextObject = WorldContextObject;
 	return Proxy;
 }
@@ -44,13 +43,8 @@ void ULoginUserCallbackProxy::Activate()
 
 	if (Identity.IsValid())
 	{
-		// Fallback to default AuthType if nothing is specified
-		if (AuthType.IsEmpty())
-		{
-			AuthType = Identity->GetAuthType();
-		}
 		DelegateHandle = Identity->AddOnLoginCompleteDelegate_Handle(Player->GetControllerId(), Delegate);
-		FOnlineAccountCredentials AccountCreds(AuthType, UserID, UserToken);
+		FOnlineAccountCredentials AccountCreds(Identity->GetAuthType(), UserID, UserToken);
 		Identity->Login(Player->GetControllerId(), AccountCreds);
 		return;
 	}
@@ -65,8 +59,6 @@ void ULoginUserCallbackProxy::OnCompleted(int32 LocalUserNum, bool bWasSuccessfu
 	{
 		ULocalPlayer* Player = Cast<ULocalPlayer>(PlayerControllerWeakPtr->Player);
 
-		FUniqueNetIdRepl UniqueID(UserId.AsShared());
-
 		if (Player)
 		{
 			auto Identity = Online::GetIdentityInterface();
@@ -75,13 +67,6 @@ void ULoginUserCallbackProxy::OnCompleted(int32 LocalUserNum, bool bWasSuccessfu
 			{
 				Identity->ClearOnLoginCompleteDelegate_Handle(Player->GetControllerId(), DelegateHandle);
 			}
-			Player->SetCachedUniqueNetId(UniqueID);
-		}
-
-		if (APlayerState* State = PlayerControllerWeakPtr->PlayerState)
-		{
-			// Update UniqueId. See also ShowLoginUICallbackProxy.cpp
-			State->SetUniqueId(UniqueID);
 		}
 	}
 

AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp

@@ -1,62 +0,0 @@
-#include "StartSessionCallbackProxyAdvanced.h"
-
-UStartSessionCallbackProxyAdvanced::UStartSessionCallbackProxyAdvanced(const FObjectInitializer& ObjectInitializer)
-	: Super(ObjectInitializer)
-	  , StartCompleteDelegate(FOnStartSessionCompleteDelegate::CreateUObject(this, &ThisClass::OnStartCompleted))
-{
-}
-
-UStartSessionCallbackProxyAdvanced* UStartSessionCallbackProxyAdvanced::StartAdvancedSession(
-	const UObject* WorldContextObject)
-{
-	UStartSessionCallbackProxyAdvanced* Proxy = NewObject<UStartSessionCallbackProxyAdvanced>();
-	Proxy->WorldContextObject = WorldContextObject;
-	return Proxy;
-}
-
-void UStartSessionCallbackProxyAdvanced::Activate()
-{
-	const FOnlineSubsystemBPCallHelperAdvanced Helper(
-		TEXT("StartSession"),
-		GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
-
-	if (Helper.OnlineSub != nullptr)
-	{
-		const auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
-		{
-			StartCompleteDelegateHandle = Sessions->AddOnStartSessionCompleteDelegate_Handle(StartCompleteDelegate);
-			Sessions->StartSession(NAME_GameSession);
-			return;
-		}
-		FFrame::KismetExecutionMessage(TEXT("Sessions not supported by Online Subsystem"), ELogVerbosity::Warning);
-	}
-
-	// Fail immediately
-	OnFailure.Broadcast();
-}
-
-void UStartSessionCallbackProxyAdvanced::OnStartCompleted(FName SessionName, bool bWasSuccessful)
-{
-	const FOnlineSubsystemBPCallHelperAdvanced Helper(
-		TEXT("StartSessionCallback"),
-		GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
-
-	if (Helper.OnlineSub != nullptr)
-	{
-		const auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
-		{
-			Sessions->ClearOnStartSessionCompleteDelegate_Handle(StartCompleteDelegateHandle);
-		}
-	}
-
-	if (bWasSuccessful)
-	{
-		OnSuccess.Broadcast();
-	}
-	else
-	{
-		OnFailure.Broadcast();
-	}
-}

AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp

@@ -29,73 +29,70 @@ UUpdateSessionCallbackProxyAdvanced* UUpdateSessionCallbackProxyAdvanced::Update
 
 void UUpdateSessionCallbackProxyAdvanced::Activate()
 {
-	const FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("UpdateSession"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
 
-	if (Helper.OnlineSub != nullptr)
+	IOnlineSessionPtr Sessions = Online::GetSessionInterface();
+
+	if (Sessions.IsValid())
 	{
-		const auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
+		if (Sessions->GetNumSessions() < 1)
 		{
-			if (Sessions->GetNumSessions() < 1)
-			{
-				OnFailure.Broadcast();
-				GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("NO REGISTERED SESSIONS!"));
-				return;
-			}
-
-			// This gets the actual session itself
-			//FNamedOnlineSession * curSession = Sessions->GetNamedSession(NAME_GameSession);
-			FOnlineSessionSettings* Settings = Sessions->GetSessionSettings(NAME_GameSession);
-
-			if (!Settings)
-			{
-				// Fail immediately
-				OnFailure.Broadcast();
-				return;
-			}
-
-			OnUpdateSessionCompleteDelegateHandle = Sessions->AddOnUpdateSessionCompleteDelegate_Handle(OnUpdateSessionCompleteDelegate);
-
-		//	FOnlineSessionSettings Settings;
-			//Settings->BuildUniqueId = GetBuildUniqueId();
-			Settings->NumPublicConnections = NumPublicConnections;
-			Settings->NumPrivateConnections = NumPrivateConnections;
-			//Settings->bShouldAdvertise = true;
-			Settings->bAllowJoinInProgress = bAllowJoinInProgress;
-			Settings->bIsLANMatch = bUseLAN;
-			//Settings->bUsesPresence = true;
-			//Settings->bAllowJoinViaPresence = true;
-			Settings->bAllowInvites = bAllowInvites;
-			Settings->bAllowJoinInProgress = bAllowJoinInProgress;
-			Settings->bIsDedicated = bDedicatedServer;
-
-			FOnlineSessionSetting * fSetting = NULL;
-			FOnlineSessionSetting ExtraSetting;
-			for (int i = 0; i < ExtraSettings.Num(); i++)
-			{
-				fSetting = Settings->Settings.Find(ExtraSettings[i].Key);
-
-				if (fSetting)
-				{
-					fSetting->Data = ExtraSettings[i].Data;
-				}
-				else
-				{
-					ExtraSetting.Data = ExtraSettings[i].Data;
-					ExtraSetting.AdvertisementType = EOnlineDataAdvertisementType::ViaOnlineService;
-					Settings->Settings.Add(ExtraSettings[i].Key, ExtraSetting);
-				}
-			}
-
-			Sessions->UpdateSession(NAME_GameSession, *Settings, bRefreshOnlineData);
-
-			// OnUpdateCompleted will get called, nothing more to do now
+			OnFailure.Broadcast();
+			GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Red, TEXT("NO REGISTERED SESSIONS!"));
 			return;
 		}
-		else
+
+		// This gets the actual session itself
+		//FNamedOnlineSession * curSession = Sessions->GetNamedSession(GameSessionName);
+		FOnlineSessionSettings* Settings = Sessions->GetSessionSettings(GameSessionName);
+
+		if (!Settings)
 		{
-			FFrame::KismetExecutionMessage(TEXT("Sessions not supported by Online Subsystem"), ELogVerbosity::Warning);
+			// Fail immediately
+			OnFailure.Broadcast();
+			return;
 		}
+
+		OnUpdateSessionCompleteDelegateHandle = Sessions->AddOnUpdateSessionCompleteDelegate_Handle(OnUpdateSessionCompleteDelegate);
+
+	//	FOnlineSessionSettings Settings;
+		//Settings->BuildUniqueId = GetBuildUniqueId();
+		Settings->NumPublicConnections = NumPublicConnections;
+		Settings->NumPrivateConnections = NumPrivateConnections;
+		//Settings->bShouldAdvertise = true;
+		Settings->bAllowJoinInProgress = bAllowJoinInProgress;
+		Settings->bIsLANMatch = bUseLAN;
+		//Settings->bUsesPresence = true;
+		//Settings->bAllowJoinViaPresence = true;
+		Settings->bAllowInvites = bAllowInvites;
+		Settings->bAllowJoinInProgress = bAllowJoinInProgress;
+		Settings->bIsDedicated = bDedicatedServer;
+
+		FOnlineSessionSetting * fSetting = NULL;
+		FOnlineSessionSetting ExtraSetting;
+		for (int i = 0; i < ExtraSettings.Num(); i++)
+		{
+			fSetting = Settings->Settings.Find(ExtraSettings[i].Key);
+
+			if (fSetting)
+			{
+				fSetting->Data = ExtraSettings[i].Data;
+			}
+			else
+			{
+				ExtraSetting.Data = ExtraSettings[i].Data;
+				ExtraSetting.AdvertisementType = EOnlineDataAdvertisementType::ViaOnlineService;
+				Settings->Settings.Add(ExtraSettings[i].Key, ExtraSetting);
+			}
+		}
+
+		Sessions->UpdateSession(GameSessionName, *Settings, bRefreshOnlineData);
+
+		// OnUpdateCompleted will get called, nothing more to do now
+		return;
+	}
+	else
+	{
+		FFrame::KismetExecutionMessage(TEXT("Sessions not supported by Online Subsystem"), ELogVerbosity::Warning);
 	}
 	// Fail immediately
 	OnFailure.Broadcast();
@@ -104,20 +101,15 @@ void UUpdateSessionCallbackProxyAdvanced::Activate()
 
 void UUpdateSessionCallbackProxyAdvanced::OnUpdateCompleted(FName SessionName, bool bWasSuccessful)
 {
-	const FOnlineSubsystemBPCallHelperAdvanced Helper(TEXT("UpdateSessionCallback"), GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull));
-
-	if (Helper.OnlineSub != nullptr)
+	IOnlineSessionPtr Sessions = Online::GetSessionInterface();
+	if (Sessions.IsValid())
 	{
-		const auto Sessions = Helper.OnlineSub->GetSessionInterface();
-		if (Sessions.IsValid())
-		{
-			Sessions->ClearOnUpdateSessionCompleteDelegate_Handle(OnUpdateSessionCompleteDelegateHandle);
+		Sessions->ClearOnUpdateSessionCompleteDelegate_Handle(OnUpdateSessionCompleteDelegateHandle);
 			
-			if (bWasSuccessful)
-			{
-				OnSuccess.Broadcast();
-				return;
-			}
+		if (bWasSuccessful)
+		{
+			OnSuccess.Broadcast();
+			return;
 		}
 	}
 

AdvancedSteamSessions/AdvancedSteamSessions.uplugin

@@ -2,8 +2,8 @@
     "FileVersion" : 3,
  
     "FriendlyName" : "Advanced Steam Sessions",
-    "Version" : 5.0,
-    "VersionName": "5.0",
+    "Version" : 1.9,
+    "VersionName": "1.9",
     "Description" : "Adds new blueprint functions to handle more advanced session operations in Steam. REQUIRES ADVANCED SESSIONS",
     "Category" : "Advanced Sessions Plugin",
     "CreatedBy" : "Joshua Statzer",
@@ -16,27 +16,5 @@
             "Type" : "RunTime",
 			"LoadingPhase" : "PreDefault"
         } 
-    ],
-	"Plugins": [
-		{
-			"Name": "AdvancedSessions",
-			"Enabled": true
-		},
-		{
-			"Name": "OnlineSubsystem",
-			"Enabled": true
-		},
-		{
-			"Name": "OnlineSubsystemUtils",
-			"Enabled": true
-		},
-		{
-			"Name": "OnlineSubsystemSteam",
-			"Enabled": true
-		},
-		{
-			"Name": "SteamShared",
-			"Enabled": true
-		}
-	]
+    ]
 }

AdvancedSteamSessions/Config/FilterPlugin.ini

@@ -1,8 +0,0 @@
-[FilterPlugin]
-; This section lists additional files which will be packaged along with your plugin. Paths should be listed relative to the root plugin directory, and
-; may include "...", "*", and "?" wildcards to match directories, files, and individual characters respectively.
-;
-; Examples:
-;    /README.txt
-;    /Extras/...
-;    /Binaries/ThirdParty/*.dll

AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs

@@ -8,12 +8,12 @@ public class AdvancedSteamSessions : ModuleRules
         PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
         //bEnforceIWYU = true;
 
-        PublicDefinitions.Add("WITH_ADVANCED_STEAM_SESSIONS=1");
+        Definitions.Add("WITH_ADVANCED_STEAM_SESSIONS=1");
 
         PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "OnlineSubsystem", "CoreUObject", "OnlineSubsystemUtils", "Networking", "Sockets", "AdvancedSessions"/*"Voice", "OnlineSubsystemSteam"*/ });
         PrivateDependencyModuleNames.AddRange(new string[] { "OnlineSubsystem", "Sockets", "Networking", "OnlineSubsystemUtils" /*"Voice", "Steamworks","OnlineSubsystemSteam"*/});
 
-        if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Linux) || (Target.Platform == UnrealTargetPlatform.Mac))
+        if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32) || (Target.Platform == UnrealTargetPlatform.Linux) || (Target.Platform == UnrealTargetPlatform.Mac))
         {
             PublicDependencyModuleNames.AddRange(new string[] { "Steamworks",/*"Voice",*/ "OnlineSubsystemSteam" });
             PublicIncludePaths.AddRange(new string[] { "../Plugins/Online/OnlineSubsystemSteam/Source/Private" });// This is dumb but it isn't very open

AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h

@@ -6,232 +6,14 @@
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#include "Interfaces/OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
+#include "OnlineFriendsInterface.h"
+#include "OnlineUserInterface.h"
+#include "OnlineMessageInterface.h"
+#include "OnlinePresenceInterface.h"
 #include "Engine/GameInstance.h"
-#include "Interfaces/OnlineSessionInterface.h"
-#include "BlueprintDataDefinitions.h"
-#include "UObject/UObjectIterator.h"
+#include "OnlineSessionInterface.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
-//	disable the warnings locally. Remove when this is fixed in the SDK
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4996)
-// #TODO check back on this at some point
-#pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on....
-#endif
-
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-
-#pragma push_macro("ARRAY_COUNT")
-#undef ARRAY_COUNT
-
-#if USING_CODE_ANALYSIS
-MSVC_PRAGMA(warning(push))
-MSVC_PRAGMA(warning(disable : ALL_CODE_ANALYSIS_WARNINGS))
-#endif	// USING_CODE_ANALYSIS
-
-#include <steam/steam_api.h>
-
-#if USING_CODE_ANALYSIS
-MSVC_PRAGMA(warning(pop))
-#endif	// USING_CODE_ANALYSIS
-
-#include <steam/isteamapps.h>
-#include <steam/isteamapplist.h>
-//#include <OnlineSubsystemSteamTypes.h>
-#pragma pop_macro("ARRAY_COUNT")
-
-// @todo Steam: See above
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// Making a copy of this here since the original is still in a private folder and is screwing with things
-/**
-* Steam specific implementation of the unique net id
-*/
-class FUniqueNetIdSteam2 :
-	public FUniqueNetId
-{
-PACKAGE_SCOPE:
-	/** Holds the net id for a player */
-	uint64 UniqueNetId;
-
-	/** Hidden on purpose */
-	FUniqueNetIdSteam2() :
-		UniqueNetId(0)
-	{
-	}
-
-	/**
-	* Copy Constructor
-	*
-	* @param Src the id to copy
-	*/
-	explicit FUniqueNetIdSteam2(const FUniqueNetIdSteam2& Src) :
-		UniqueNetId(Src.UniqueNetId)
-	{
-	}
-
-public:
-	/**
-	* Constructs this object with the specified net id
-	*
-	* @param InUniqueNetId the id to set ours to
-	*/
-	explicit FUniqueNetIdSteam2(uint64 InUniqueNetId) :
-		UniqueNetId(InUniqueNetId)
-	{
-	}
-
-	/**
-	* Constructs this object with the steam id
-	*
-	* @param InUniqueNetId the id to set ours to
-	*/
-	explicit FUniqueNetIdSteam2(CSteamID InSteamId) :
-		UniqueNetId(InSteamId.ConvertToUint64())
-	{
-	}
-
-	/**
-	* Constructs this object with the specified net id
-	*
-	* @param String textual representation of an id
-	*/
-	explicit FUniqueNetIdSteam2(const FString& Str) :
-		UniqueNetId(FCString::Atoi64(*Str))
-	{
-	}
-
-
-	/**
-	* Constructs this object with the specified net id
-	*
-	* @param InUniqueNetId the id to set ours to (assumed to be FUniqueNetIdSteam in fact)
-	*/
-	explicit FUniqueNetIdSteam2(const FUniqueNetId& InUniqueNetId) :
-		UniqueNetId(*(uint64*)InUniqueNetId.GetBytes())
-	{
-	}
-
-	virtual FName GetType() const override
-	{
-		return STEAM_SUBSYSTEM;
-	}
-
-	/**
-	* Get the raw byte representation of this net id
-	* This data is platform dependent and shouldn't be manipulated directly
-	*
-	* @return byte array of size GetSize()
-	*/
-	virtual const uint8* GetBytes() const override
-	{
-		return (uint8*)&UniqueNetId;
-	}
-
-	/**
-	* Get the size of the id
-	*
-	* @return size in bytes of the id representation
-	*/
-	virtual int32 GetSize() const override
-	{
-		return sizeof(uint64);
-	}
-
-	/**
-	* Check the validity of the id
-	*
-	* @return true if this is a well formed ID, false otherwise
-	*/
-	virtual bool IsValid() const override
-	{
-		return UniqueNetId != 0 && CSteamID(UniqueNetId).IsValid();
-	}
-
-	/**
-	* Platform specific conversion to string representation of data
-	*
-	* @return data in string form
-	*/
-	virtual FString ToString() const override
-	{
-		return FString::Printf(TEXT("%llu"), UniqueNetId);
-	}
-
-	/**
-	* Get a human readable representation of the net id
-	* Shouldn't be used for anything other than logging/debugging
-	*
-	* @return id in string form
-	*/
-	virtual FString ToDebugString() const override
-	{
-		CSteamID SteamID(UniqueNetId);
-		if (SteamID.IsLobby())
-		{
-			return FString::Printf(TEXT("Lobby [0x%llX]"), UniqueNetId);
-		}
-		else if (SteamID.BAnonGameServerAccount())
-		{
-			return FString::Printf(TEXT("Server [0x%llX]"), UniqueNetId);
-		}
-		else if (SteamID.IsValid())
-		{
-			const FString NickName(SteamFriends() ? UTF8_TO_TCHAR(SteamFriends()->GetFriendPersonaName(UniqueNetId)) : TEXT("UNKNOWN"));
-			return FString::Printf(TEXT("%s [0x%llX]"), *NickName, UniqueNetId);
-		}
-		else
-		{
-			return FString::Printf(TEXT("INVALID [0x%llX]"), UniqueNetId);
-		}
-	}
-
-	/** Needed for TMap::GetTypeHash() */
-	friend uint32 GetTypeHash(const FUniqueNetIdSteam2& A)
-	{
-		return GetTypeHash(A.UniqueNetId);
-		//return (uint32)(A.UniqueNetId) + ((uint32)((A.UniqueNetId) >> 32) * 23);
-	}
-
-	/** Convenience cast to CSteamID */
-	operator CSteamID()
-	{
-		return UniqueNetId;
-	}
-
-	/** Convenience cast to CSteamID */
-	operator const CSteamID() const
-	{
-		return UniqueNetId;
-	}
-
-	/** Convenience cast to CSteamID pointer */
-	operator CSteamID*()
-	{
-		return (CSteamID*)&UniqueNetId;
-	}
-
-	/** Convenience cast to CSteamID pointer */
-	operator const CSteamID*() const
-	{
-		return (const CSteamID*)&UniqueNetId;
-	}
-
-	friend FArchive& operator<<(FArchive& Ar, FUniqueNetIdSteam2& UserId)
-	{
-		return Ar << UserId.UniqueNetId;
-	}
-};
-
-#endif
+#include "UObjectIterator.h"
 
 #include "AdvancedSteamFriendsLibrary.generated.h"
 
@@ -242,47 +24,11 @@ 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
 };
 
-UENUM(Blueprintable)
-enum class ESteamUserOverlayType : uint8
-{
-	/*Opens the overlay web browser to the specified user or groups profile.*/
-	steamid,
-	/*Opens a chat window to the specified user, or joins the group chat.*/
-	chat,
-	/*Opens a window to a Steam Trading session that was started with the ISteamEconomy / StartTrade Web API.*/
-	jointrade,
-	/*Opens the overlay web browser to the specified user's stats.*/
-	stats,
-	/*Opens the overlay web browser to the specified user's achievements.*/
-	achievements,
-	/*Opens the overlay in minimal mode prompting the user to add the target user as a friend.*/
-	friendadd,
-	/*Opens the overlay in minimal mode prompting the user to remove the target friend.*/
-	friendremove,
-	/*Opens the overlay in minimal mode prompting the user to accept an incoming friend invite.*/
-	friendrequestaccept,
-	/*Opens the overlay in minimal mode prompting the user to ignore an incoming friend invite.*/
-	friendrequestignore
-};
-
-static FString EnumToString(const FString& enumName, uint8 value)
-{
-	const UEnum* EnumPtr = FindObject<UEnum>(ANY_PACKAGE, *enumName, true);
-
-	if (!EnumPtr)
-		return FString();
-
-	FString EnumName = EnumPtr->GetNameStringByIndex(value);
-	return EnumName;
-}
-
-
 USTRUCT(BlueprintType, Category = "Online|SteamAPI|SteamGroups")
 struct FBPSteamGroupInfo
 {
@@ -291,32 +37,21 @@ struct FBPSteamGroupInfo
 public:
 	
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		FBPUniqueNetId GroupID; // Uint64 representation
+	FBPUniqueNetId GroupID; // Uint64 representation
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		FString GroupName;
+	FString GroupName;
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		FString GroupTag;
+	FString GroupTag;
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		int32 numOnline = 0;
+	int32 numOnline;
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		int32 numInGame = 0;
+	int32 numInGame;
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		int32 numChatting = 0;
+	int32 numChatting;
 
 };
 
-UENUM(Blueprintable)
-enum class EBPTextFilteringContext : uint8
-{
-	/*Unknown context.*/
-	FContext_Unknown = 0,
-	/*Game content, only legally required filtering is performed.*/
-	FContext_GameContent = 1,
-	/*Char from another player.*/
-	FContext_Chat = 2,
-	/*Character or item name.*/
-	FContext_Name = 3
-};
+
 
 UCLASS()
 class UAdvancedSteamFriendsLibrary : public UBlueprintFunctionLibrary
@@ -334,14 +69,6 @@ public:
 	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|SteamAPI")
 	static bool RequestSteamFriendInfo(const FBPUniqueNetId UniqueNetId, bool bRequireNameOnly = false);
 	
-	// Opens the steam overlay to go to the specified user dialog
-	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|SteamAPI")
-		static bool OpenSteamUserOverlay(const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType);
-	
-	// Returns if the steam overlay is currently active (this can return false during initial overlay hooking)
-	UFUNCTION(BlueprintPure, Category = "Online|AdvancedFriends|SteamAPI")
-		static bool IsOverlayEnabled();
-
 	// Gets the level of a friends steam account, STEAM ONLY, Returns -1 if the steam level is not known, might need RequestSteamFriendInfo called first.
 	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|SteamAPI")
 	static int32 GetFriendSteamLevel(const FBPUniqueNetId UniqueNetId);
@@ -354,34 +81,13 @@ 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.
+	*  The game name is retrieved from steamSDK AppList which isn't available to all game IDs without request, can use the AppID with the
+	*  WebAPI GetAppList request as an alternative.
 	*/
 	UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|SteamAPI", meta = (ExpandEnumAsExecs = "Result"))
-	static void GetSteamFriendGamePlayed(const FBPUniqueNetId UniqueNetId, EBlueprintResultSwitch &Result/*, FString & GameName*/, int32 & AppID);
+	static void GetSteamFriendGamePlayed(const FBPUniqueNetId UniqueNetId, EBlueprintResultSwitch &Result, FString & GameName, int32 & AppID);
 
-	// Get a full list of steam groups
 	UFUNCTION(BlueprintCallable, Category = "Online|SteamAPI|SteamGroups")
 		static void GetSteamGroups(TArray<FBPSteamGroupInfo> & SteamGroups);
-
-	// Initializes text filtering (pre-loading dictonaries)
-	// Returns if it succeeded, false if filtering is unavailable for the games language
-	UFUNCTION(BlueprintCallable, Category = "Online|SteamAPI|TextFiltering")
-		static bool InitTextFiltering();
-
-	// Attempts to filter a string with the given filtering context
-	// Returns true if the text has been filtered, false if it hasn't (no filtering required or operation failed)
-	// If false it will still output the original text
-	// Textsource is the steam id that is the source of the text (player name / chat)
-	// Requires that InitTextFiltering be called first!!
-	UFUNCTION(BlueprintCallable, Category = "Online|SteamAPI|TextFiltering")
-		static bool FilterText(FString TextToFilter, EBPTextFilteringContext Context, const FBPUniqueNetId TextSourceID, FString& FilteredText);
-
-	// Returns if steam is running in big picture mode
-	UFUNCTION(BlueprintPure, Category = "Online|SteamAPI")
-		static bool IsSteamInBigPictureMode();
 };	

AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h

@@ -1,7 +1,7 @@
 #pragma once
  
 #include "CoreMinimal.h"
-#include "Modules/ModuleManager.h"
+#include "ModuleManager.h"
 
 class AdvancedSteamSessions : public IModuleInterface
 {

AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h

@@ -6,19 +6,13 @@
 #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"
+#include "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
 //	disable the warnings locally. Remove when this is fixed in the SDK
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4996)
-// #TODO check back on this at some point
-#pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on....
 #endif
 
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
@@ -26,18 +20,8 @@
 #pragma push_macro("ARRAY_COUNT")
 #undef ARRAY_COUNT
 
-#if USING_CODE_ANALYSIS
-MSVC_PRAGMA(warning(push))
-MSVC_PRAGMA(warning(disable : ALL_CODE_ANALYSIS_WARNINGS))
-#endif	// USING_CODE_ANALYSIS
-
 #include <steam/steam_api.h>
 
-#if USING_CODE_ANALYSIS
-MSVC_PRAGMA(warning(pop))
-#endif	// USING_CODE_ANALYSIS
-
-
 #pragma pop_macro("ARRAY_COUNT")
 
 #endif
@@ -83,7 +67,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 +191,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;
@@ -243,26 +215,6 @@ public:
 		CreatorSteamID = FString::Printf(TEXT("%llu"), hUGCDetails.m_ulSteamIDOwner);
 	}
 
-	FBPSteamWorkshopItemDetails(const SteamUGCDetails_t &hUGCDetails)
-	{
-		ResultOfRequest = (FBPSteamResult)hUGCDetails.m_eResult;
-		FileType = (FBPWorkshopFileType)hUGCDetails.m_eFileType;
-		CreatorAppID = (int32)hUGCDetails.m_nCreatorAppID;
-		ConsumerAppID = (int32)hUGCDetails.m_nConsumerAppID;
-		Title = FString(hUGCDetails.m_rgchTitle, k_cchPublishedDocumentTitleMax);
-		Description = FString(hUGCDetails.m_rgchDescription, k_cchPublishedDocumentDescriptionMax);
-		ItemUrl = FString(hUGCDetails.m_rgchURL, k_cchPublishedFileURLMax);
-		VotesUp = (int32)hUGCDetails.m_unVotesUp;
-		VotesDown = (int32)hUGCDetails.m_unVotesDown;
-		CalculatedScore = hUGCDetails.m_flScore;
-		bBanned = hUGCDetails.m_bBanned;
-		bAcceptedForUse = hUGCDetails.m_bAcceptedForUse;
-		bTagsTruncated = hUGCDetails.m_bTagsTruncated;
-
-		CreatorSteamID = FString::Printf(TEXT("%llu"), hUGCDetails.m_ulSteamIDOwner);
-	}
-#endif
-
 	// Result of obtaining the details
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|AdvancedSteamWorkshop")
 		FBPSteamResult ResultOfRequest;

AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h

@@ -11,29 +11,15 @@
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4996)
-// #TODO check back on this at some point
-#pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on....
 #endif
 
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 
-#include "OnlineSubsystemSteam.h"
-
 #pragma push_macro("ARRAY_COUNT")
 #undef ARRAY_COUNT
 
-#if USING_CODE_ANALYSIS
-MSVC_PRAGMA(warning(push))
-MSVC_PRAGMA(warning(disable : ALL_CODE_ANALYSIS_WARNINGS))
-#endif	// USING_CODE_ANALYSIS
-
 #include <steam/steam_api.h>
 
-#if USING_CODE_ANALYSIS
-MSVC_PRAGMA(warning(pop))
-#endif	// USING_CODE_ANALYSIS
-
-
 #pragma pop_macro("ARRAY_COUNT")
 
 #endif
@@ -55,7 +41,7 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
 		FBPUniqueNetId OfficerUniqueNetID; // Uint64 representation
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		bool bIsOwner = false;
+	bool bIsOwner;
 
 };
 
@@ -67,8 +53,6 @@ class USteamRequestGroupOfficersCallbackProxy : public UOnlineBlueprintCallProxy
 {
 	GENERATED_UCLASS_BODY()
 
-	virtual ~USteamRequestGroupOfficersCallbackProxy();
-
 	// Called when there is a successful results return
 	UPROPERTY(BlueprintAssignable)
 	FBlueprintGroupOfficerDetailsDelegate OnSuccess;
@@ -77,7 +61,7 @@ class USteamRequestGroupOfficersCallbackProxy : public UOnlineBlueprintCallProxy
 	UPROPERTY(BlueprintAssignable)
 	FBlueprintGroupOfficerDetailsDelegate OnFailure;
 
-	// Returns a list of steam group officers
+	// Retruns a list of steam group officers
 	UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject"), Category = "Online|SteamAPI|SteamGroups")
 	static USteamRequestGroupOfficersCallbackProxy* GetSteamGroupOfficerList(UObject* WorldContextObject, FBPUniqueNetId GroupUniqueNetID);
 
@@ -90,7 +74,6 @@ private:
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	void OnRequestGroupOfficerDetails( ClanOfficerListResponse_t *pResult, bool bIOFailure);
 	CCallResult<USteamRequestGroupOfficersCallbackProxy, ClanOfficerListResponse_t> m_callResultGroupOfficerRequestDetails;
-
 #endif
 
 private:

AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h

@@ -12,29 +12,15 @@
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4996)
-// #TODO check back on this at some point
-#pragma warning(disable:4265) // SteamAPI CCallback< specifically, this warning is off by default but 4.17 turned it on....
 #endif
 
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 
-#include "OnlineSubsystemSteam.h"
-
 #pragma push_macro("ARRAY_COUNT")
 #undef ARRAY_COUNT
 
-#if USING_CODE_ANALYSIS
-MSVC_PRAGMA(warning(push))
-MSVC_PRAGMA(warning(disable : ALL_CODE_ANALYSIS_WARNINGS))
-#endif	// USING_CODE_ANALYSIS
-
 #include <steam/steam_api.h>
 
-#if USING_CODE_ANALYSIS
-MSVC_PRAGMA(warning(pop))
-#endif	// USING_CODE_ANALYSIS
-
-
 #pragma pop_macro("ARRAY_COUNT")
 
 #endif
@@ -44,7 +30,6 @@ MSVC_PRAGMA(warning(pop))
 #pragma warning(pop)
 #endif
 
-
 #include "SteamWSRequestUGCDetailsCallbackProxy.generated.h"
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FBlueprintWorkshopDetailsDelegate, const FBPSteamWorkshopItemDetails&, WorkShopDetails);

AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp

@@ -2,6 +2,33 @@
 #include "AdvancedSteamFriendsLibrary.h"
 #include "OnlineSubSystemHeader.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
+//	disable the warnings locally. Remove when this is fixed in the SDK
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4996)
+#endif
+
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
+
+#pragma push_macro("ARRAY_COUNT")
+#undef ARRAY_COUNT
+
+#include <steam/steam_api.h>
+#include <steam/isteamapps.h>
+#include <steam/isteamapplist.h>
+#include <OnlineSubsystemSteamTypes.h>
+#pragma pop_macro("ARRAY_COUNT")
+
+#endif
+
+// @todo Steam: See above
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 //General Log
 DEFINE_LOG_CATEGORY(AdvancedSteamFriendsLog);
 
@@ -11,7 +38,7 @@ DEFINE_LOG_CATEGORY(AdvancedSteamFriendsLog);
 {
 
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
+	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid())
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("IsAFriend Had a bad UniqueNetId!"));
 		return 0;
@@ -58,7 +85,6 @@ DEFINE_LOG_CATEGORY(AdvancedSteamFriendsLog);
 
 void UAdvancedSteamFriendsLibrary::GetSteamGroups(TArray<FBPSteamGroupInfo> & SteamGroups)
 {
-	
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 
 	if (SteamAPI_Init())
@@ -74,7 +100,7 @@ void UAdvancedSteamFriendsLibrary::GetSteamGroups(TArray<FBPSteamGroupInfo> & St
 
 			FBPSteamGroupInfo GroupInfo;
 
-			TSharedPtr<const FUniqueNetId> ValueID(new const FUniqueNetIdSteam2(SteamGroupID));
+			TSharedPtr<const FUniqueNetId> ValueID(new const FUniqueNetIdSteam(SteamGroupID));
 			GroupInfo.GroupID.SetUniqueNetId(ValueID);
 			SteamFriends()->GetClanActivityCounts(SteamGroupID, &GroupInfo.numOnline, &GroupInfo.numInGame, &GroupInfo.numChatting);
 			GroupInfo.GroupName = FString(UTF8_TO_TCHAR(SteamFriends()->GetClanName(SteamGroupID)));
@@ -84,14 +110,13 @@ void UAdvancedSteamFriendsLibrary::GetSteamGroups(TArray<FBPSteamGroupInfo> & St
 		}
 	}
 #endif
-
 }
 
-void UAdvancedSteamFriendsLibrary::GetSteamFriendGamePlayed(const FBPUniqueNetId UniqueNetId, EBlueprintResultSwitch &Result/*, FString & GameName*/, int32 & AppID)
+void UAdvancedSteamFriendsLibrary::GetSteamFriendGamePlayed(const FBPUniqueNetId UniqueNetId, EBlueprintResultSwitch &Result, FString & GameName, int32 & AppID)
 {
 
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
+	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid())
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("GetSteamFriendGamePlayed Had a bad UniqueNetId!"));
 		Result = EBlueprintResultSwitch::OnFailure;
@@ -109,15 +134,13 @@ void UAdvancedSteamFriendsLibrary::GetSteamFriendGamePlayed(const FBPUniqueNetId
 		{
 			AppID = GameInfo.m_gameID.AppID();
 
-			// Forgot this test and left it in, it is incorrect, you would need restricted access
-			// And it would only find games in the local library anyway
-			/*char NameBuffer[512];
+			char NameBuffer[512];
 			int Len = SteamAppList()->GetAppName(GameInfo.m_gameID.AppID(), NameBuffer, 512);
 
 			if (Len != -1) // Invalid
 			{
 				GameName = FString(UTF8_TO_TCHAR(NameBuffer));
-			}*/
+			}
 
 			Result = EBlueprintResultSwitch::OnSuccess;
 			return;
@@ -133,7 +156,7 @@ int32 UAdvancedSteamFriendsLibrary::GetFriendSteamLevel(const FBPUniqueNetId Uni
 {
 
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
+	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid())
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("IsAFriend Had a bad UniqueNetId!"));
 		return 0;
@@ -154,7 +177,7 @@ FString UAdvancedSteamFriendsLibrary::GetSteamPersonaName(const FBPUniqueNetId U
 {
 
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
+	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid())
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("GetSteamPersonaName Had a bad UniqueNetId!"));
 		return FString(TEXT(""));
@@ -185,7 +208,7 @@ FBPUniqueNetId UAdvancedSteamFriendsLibrary::CreateSteamIDFromString(const FStri
 	if (SteamAPI_Init())
 	{
 		// Already does the conversion
-		TSharedPtr<const FUniqueNetId> ValueID(new const FUniqueNetIdSteam2(SteamID64));
+		TSharedPtr<const FUniqueNetId> ValueID(new const FUniqueNetIdSteam(SteamID64));
 		//FCString::Atoi64(*SteamID64));
 		
 		netId.SetUniqueNetId(ValueID);
@@ -196,25 +219,10 @@ 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
-	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
+	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid())
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("RequestSteamFriendInfo Had a bad UniqueNetId!"));
 		return false;
@@ -232,46 +240,10 @@ bool UAdvancedSteamFriendsLibrary::RequestSteamFriendInfo(const FBPUniqueNetId U
 	return false;
 }
 
-
-bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType)
-{
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
-	{
-		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("OpenSteamUserOverlay Had a bad UniqueNetId!"));
-		return false;
-	}
-
-	if (SteamAPI_Init())
-	{
-		uint64 id = *((uint64*)UniqueNetId.UniqueNetId->GetBytes());
-		FString DialogName = EnumToString("ESteamUserOverlayType", (uint8)DialogType);
-		SteamFriends()->ActivateGameOverlayToUser(TCHAR_TO_ANSI(*DialogName), id);
-		return true;
-	}
-#endif
-
-	UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("OpenSteamUserOverlay Couldn't init steamAPI!"));
-	return false;
-}
-
-bool UAdvancedSteamFriendsLibrary::IsOverlayEnabled()
-{
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-	if (SteamAPI_Init())
-	{
-		return SteamUtils()->IsOverlayEnabled();
-	}
-#endif
-
-	UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("OpenSteamUserOverlay Couldn't init steamAPI!"));
-	return false;
-}
-
 UTexture2D * UAdvancedSteamFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueNetId UniqueNetId, EBlueprintAsyncResultSwitch &Result, SteamAvatarSize AvatarSize)
 {
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM)
+	if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid())
 	{
 		UE_LOG(AdvancedSteamFriendsLog, Warning, TEXT("GetSteamFriendAvatar Had a bad UniqueNetId!"));
 		Result = EBlueprintAsyncResultSwitch::OnFailure;
@@ -332,22 +304,18 @@ UTexture2D * UAdvancedSteamFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueN
 
 			UTexture2D* Avatar = UTexture2D::CreateTransient(Width, Height, PF_R8G8B8A8);
 			// Switched to a Memcpy instead of byte by byte transer
+			uint8* MipData = (uint8*)Avatar->PlatformData->Mips[0].BulkData.Lock(LOCK_READ_WRITE);
+			FMemory::Memcpy(MipData, (void*)oAvatarRGBA, Height * Width * 4);
+			Avatar->PlatformData->Mips[0].BulkData.Unlock();
 
-			if (FTexturePlatformData* PlatformData = Avatar->GetPlatformData())
-			{
-				uint8* MipData = (uint8*)PlatformData->Mips[0].BulkData.Lock(LOCK_READ_WRITE);
-				FMemory::Memcpy(MipData, (void*)oAvatarRGBA, Height * Width * 4);
-				PlatformData->Mips[0].BulkData.Unlock();
+			// Original implementation was missing this!!
+			// the hell man......
+			delete[] oAvatarRGBA;
 
-				// Original implementation was missing this!!
-				// the hell man......
-				delete[] oAvatarRGBA;
-
-				//Setting some Parameters for the Texture and finally returning it
-				PlatformData->SetNumSlices(1);
-				Avatar->NeverStream = true;
-				//Avatar->CompressionSettings = TC_EditorIcon;
-			}
+			//Setting some Parameters for the Texture and finally returning it
+			Avatar->PlatformData->NumSlices = 1;
+			Avatar->NeverStream = true;
+			//Avatar->CompressionSettings = TC_EditorIcon;
 
 			Avatar->UpdateResource();
 
@@ -368,76 +336,3 @@ UTexture2D * UAdvancedSteamFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueN
 	Result = EBlueprintAsyncResultSwitch::OnFailure;
 	return nullptr;
 }
-
-bool UAdvancedSteamFriendsLibrary::InitTextFiltering()
-{
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-
-	if (SteamAPI_Init())
-	{
-		return SteamUtils()->InitFilterText();
-	}
-
-#endif
-
-	return false;
-}
-
-bool UAdvancedSteamFriendsLibrary::FilterText(FString TextToFilter, EBPTextFilteringContext Context, const FBPUniqueNetId TextSourceID, FString& FilteredText)
-{
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-
-	if (SteamAPI_Init())
-	{
-		uint32 BufferLen = TextToFilter.Len() + 10; // Docs say 1 byte excess min, going with 10
-		char* OutText = new char[BufferLen];
-		
-		uint64 id = 0;
-
-		if (TextSourceID.IsValid())
-		{
-			id = *((uint64*)TextSourceID.UniqueNetId->GetBytes());
-		}
-		
-		// MAC is bugged with current steam version according to epic, they forced it to be the old steam ver
-#if PLATFORM_MAC
-			// Filters the provided input message and places the filtered result into pchOutFilteredText.
-			//   pchOutFilteredText is where the output will be placed, even if no filtering or censoring is performed
-			//   nByteSizeOutFilteredText is the size (in bytes) of pchOutFilteredText
-			//   pchInputText is the input string that should be filtered, which can be ASCII or UTF-8
-			//   bLegalOnly should be false if you want profanity and legally required filtering (where required) and true if you want legally required filtering only
-			//   Returns the number of characters (not bytes) filtered.
-			int FilterCount = SteamUtils()->FilterText(OutText, BufferLen, TCHAR_TO_ANSI(*TextToFilter), Context == EBPTextFilteringContext::FContext_GameContent);
-#else
-		int FilterCount = SteamUtils()->FilterText((ETextFilteringContext)Context, id, TCHAR_TO_ANSI(*TextToFilter), OutText, BufferLen);
-#endif
-
-		if (FilterCount > 0)
-		{
-			FilteredText = FString(UTF8_TO_TCHAR(OutText));
-			delete[] OutText;
-			return true;
-		}
-
-		delete[] OutText;
-	}
-
-#endif
-
-	FilteredText = TextToFilter;
-	return false;
-}
-
-bool UAdvancedSteamFriendsLibrary::IsSteamInBigPictureMode()
-{
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-
-	if (SteamAPI_Init())
-	{
-		return SteamUtils()->IsSteamInBigPictureMode();
-	}
-
-#endif
-
-	return false;
-}

AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp

@@ -1,13 +1,7 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 
 #include "SteamRequestGroupOfficersCallbackProxy.h"
-#include "Online/CoreOnline.h"
-#include "AdvancedSteamFriendsLibrary.h"
 #include "OnlineSubSystemHeader.h"
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-#include "steam/isteamfriends.h"
-#endif
-//#include "OnlineSubsystemSteamTypes.h"
 
 //////////////////////////////////////////////////////////////////////////
 // UEndSessionCallbackProxy
@@ -17,9 +11,6 @@ USteamRequestGroupOfficersCallbackProxy::USteamRequestGroupOfficersCallbackProxy
 {
 }
 
-USteamRequestGroupOfficersCallbackProxy::~USteamRequestGroupOfficersCallbackProxy()
-{
-}
 
 USteamRequestGroupOfficersCallbackProxy* USteamRequestGroupOfficersCallbackProxy::GetSteamGroupOfficerList(UObject* WorldContextObject, FBPUniqueNetId GroupUniqueNetID)
 {
@@ -45,24 +36,15 @@ void USteamRequestGroupOfficersCallbackProxy::Activate()
 	OnFailure.Broadcast(EmptyArray);
 }
 
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanOfficerListResponse_t *pResult, bool bIOFailure)
 {
 	TArray<FBPSteamGroupOfficer> OfficerArray;
 
-	FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM));
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 
 	if (bIOFailure || !pResult || !pResult->m_bSuccess)
 	{
-		if (SteamSubsystem != nullptr)
-		{
-			SteamSubsystem->ExecuteNextTick([this]()
-			{
-				TArray<FBPSteamGroupOfficer> FailureArray;
-				OnFailure.Broadcast(FailureArray);
-			});
-		}
-		//OnFailure.Broadcast(OfficerArray);
+		OnFailure.Broadcast(OfficerArray);
 		return;
 	}
 
@@ -75,7 +57,7 @@ void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanO
 
 		Officer.bIsOwner = true;
 
-		TSharedPtr<const FUniqueNetId> ValueID(new const FUniqueNetIdSteam2(ClanOwner));
+		TSharedPtr<const FUniqueNetId> ValueID(new const FUniqueNetIdSteam(ClanOwner));
 		Officer.OfficerUniqueNetID.SetUniqueNetId(ValueID);
 		OfficerArray.Add(Officer);
 
@@ -85,37 +67,17 @@ void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanO
 
 			Officer.bIsOwner = false;
 
-			TSharedPtr<const FUniqueNetId> newValueID(new const FUniqueNetIdSteam2(OfficerSteamID));
+			TSharedPtr<const FUniqueNetId> newValueID(new const FUniqueNetIdSteam(OfficerSteamID));
 			Officer.OfficerUniqueNetID.SetUniqueNetId(newValueID);
 
 			OfficerArray.Add(Officer);
 		}
 
-		if (SteamSubsystem != nullptr)
-		{
-			SteamSubsystem->ExecuteNextTick([OfficerArray, this]()
-			{
-				OnSuccess.Broadcast(OfficerArray);
-			});
-		}
-
-		//OnSuccess.Broadcast(OfficerArray);
+		OnSuccess.Broadcast(OfficerArray);
 		return;
 	}
-	else
-	{
-		if (SteamSubsystem != nullptr)
-		{
-			SteamSubsystem->ExecuteNextTick([this]()
-			{
-				TArray<FBPSteamGroupOfficer> FailureArray;
-				OnFailure.Broadcast(FailureArray);
-			});
-		}
-	}
-
-	// Should never hit this anyway
-	//OnFailure.Broadcast(OfficerArray);
-}
 #endif
 
+	OnFailure.Broadcast(OfficerArray);
+}
+

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,21 +46,13 @@ void USteamWSRequestUGCDetailsCallbackProxy::Activate()
 	OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
 }
 
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 void USteamWSRequestUGCDetailsCallbackProxy::OnUGCRequestUGCDetails(SteamUGCQueryCompleted_t *pResult, bool bIOFailure)
 {
-	FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM));
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 
 	if (bIOFailure || !pResult || pResult->m_unNumResultsReturned <= 0)
 	{
-		if (SteamSubsystem != nullptr)
-		{
-			SteamSubsystem->ExecuteNextTick([this]()
-			{
-				OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
-			});
-		}
-		//OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
+		OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
 		return;
 	}
 	if (SteamAPI_Init())
@@ -71,31 +60,12 @@ void USteamWSRequestUGCDetailsCallbackProxy::OnUGCRequestUGCDetails(SteamUGCQuer
 		SteamUGCDetails_t Details;
 		if (SteamUGC()->GetQueryUGCResult(pResult->m_handle, 0, &Details))
 		{
-			if (SteamSubsystem != nullptr)
-			{
-				SteamSubsystem->ExecuteNextTick([Details, this]()
-				{
-					OnSuccess.Broadcast(FBPSteamWorkshopItemDetails(Details));
-				});
-			}
-
-			//OnSuccess.Broadcast(FBPSteamWorkshopItemDetails(Details));
+			OnSuccess.Broadcast(FBPSteamWorkshopItemDetails(Details));
 			return;
 		}
 	}
-	else
-	{
-		if (SteamSubsystem != nullptr)
-		{
-			SteamSubsystem->ExecuteNextTick([this]()
-			{
-				OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
-			});
-		}
-	}
-
-	// Not needed, should never hit here
-	//OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
-}
 #endif
 
+	OnFailure.Broadcast(FBPSteamWorkshopItemDetails());
+}
+

README.md

@@ -1,7 +1 @@
-### How do I use it? ###
-
-**KantanDocGen Automatic Documentation ([KantanDocGen](http://kantandev.com/free/kantan-doc-gen))** 
-
-**[AdvancedSessions](https://vreue4.com/generated-node-documentation?section=advanced-sessions-plugin)**
-
-**[AdvancedSteamSessions](https://vreue4.com/generated-node-documentation?section=advanced-steam-sessions-plugin)**
+Readme and documentation will be worked on soon