Added OpenSteamUserOverlay to the AdvancedSteamFriendsLibrary

Former-commit-id: ff8fba2bb8af40ef3efb5f022c9d1df7de3ab135

AdvancedSessions/AdvancedSessions.uplugin

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

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"*/ });
+        PrivateIncludePaths.AddRange(new string[] { "AdvancedSessions/Private"/*, "OnlineSubsystemSteam/Private"*/ });
-       // PublicIncludePaths.AddRange(new string[] { "AdvancedSessions/Public" });
+        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

@@ -6,15 +6,15 @@
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#include "Interfaces/OnlineFriendsInterface.h"
+#include "OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
+#include "OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
+#include "OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.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"
@@ -65,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 "OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
+#include "OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
+#include "OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.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 "OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
+#include "OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
+#include "OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.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/AdvancedIdentityLibrary.h

@@ -6,13 +6,13 @@
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#include "Interfaces/OnlineIdentityInterface.h"
+#include "OnlineIdentityInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
+#include "OnlineUserInterface.h"
-#include "Interfaces/OnlinePresenceInterface.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

@@ -6,12 +6,12 @@
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#include "Interfaces/OnlineFriendsInterface.h"
+#include "OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
+#include "OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
+#include "OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
+#include "OnlinePresenceInterface.h"
 #include "Engine/GameInstance.h"
-#include "Interfaces/OnlineSessionInterface.h"
+#include "OnlineSessionInterface.h"
 
 //#include "UObjectIterator.h"
 

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/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 "Core.h"
-#include "Interfaces/OnlineSessionInterface.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 "ModuleManager.h"
-#include "Modules/ModuleManager.h"
 #include "OnlineSubsystemUtilsClasses.h"
 #include "BlueprintDataDefinitions.generated.h"	
 

AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h

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

AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h

@@ -18,13 +18,7 @@ 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.
-	 *    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 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.
-	 */
 	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 bAllowJoinViaPresence = true, bool bAllowJoinViaPresenceFriendsOnly = false, bool bAntiCheatProtected = false, bool bUsesStats = false, bool bShouldAdvertise = true);
 

AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h

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

AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h

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

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,7 +20,7 @@ class ULoginUserCallbackProxy : public UOnlineBlueprintCallProxyBase
 	UPROPERTY(BlueprintAssignable)
 	FEmptyOnlineDelegate OnFailure;
 
-	// Logs into the identity interface
+	// 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);
 

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/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);

AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp

@@ -427,7 +427,7 @@ void UAdvancedSessionsLibrary::GetPlayerName(APlayerController *PlayerController
 
 	if (APlayerState* PlayerState = (PlayerController != NULL) ? PlayerController->PlayerState : NULL)
 	{
-		PlayerName = PlayerState->GetPlayerName();
+		PlayerName = PlayerState->PlayerName;
 		return;
 	}
 	else

AdvancedSteamSessions/AdvancedSteamSessions.uplugin

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

AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs

@@ -8,7 +8,7 @@ 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"*/});

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 "OnlineFriendsInterface.h"
-#include "Interfaces/OnlineUserInterface.h"
+#include "OnlineUserInterface.h"
-#include "Interfaces/OnlineMessageInterface.h"
+#include "OnlineMessageInterface.h"
-#include "Interfaces/OnlinePresenceInterface.h"
+#include "OnlinePresenceInterface.h"
 #include "Engine/GameInstance.h"
-#include "Interfaces/OnlineSessionInterface.h"
+#include "OnlineSessionInterface.h"
-#include "BlueprintDataDefinitions.h"
-#include "UObject/UObjectIterator.h"
 
-// This is taken directly from UE4 - OnlineSubsystemSteamPrivatePCH.h as a fix for the array_count macro
+#include "UObjectIterator.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
-
-#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 "AdvancedSteamFriendsLibrary.generated.h"
 
@@ -290,20 +72,22 @@ 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;
+	int32 numOnline;
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		int32 numInGame;
+	int32 numInGame;
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|SteamAPI|SteamGroups")
-		int32 numChatting;
+	int32 numChatting;
 
 };
 
+
+
 UCLASS()
 class UAdvancedSteamFriendsLibrary : public UBlueprintFunctionLibrary
 {
@@ -336,17 +120,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);
 };	

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,9 +6,7 @@
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
 #include "OnlineSubsystem.h"
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
+#include "OnlineSessionInterface.h"
-#endif
-#include "Interfaces/OnlineSessionInterface.h"
 
 // @todo Steam: Steam headers trigger secure-C-runtime warnings in Visual C++. Rather than mess with _CRT_SECURE_NO_WARNINGS, we'll just
 //	disable the warnings locally. Remove when this is fixed in the SDK
@@ -205,22 +203,11 @@ struct FBPSteamWorkshopItemDetails
 	GENERATED_USTRUCT_BODY()
 
 public:
-
 	FBPSteamWorkshopItemDetails()
 	{
-		ResultOfRequest = FBPSteamResult::k_EResultOK;
+
-		FileType = FBPWorkshopFileType::k_EWorkshopFileTypeMax;
-		CreatorAppID = 0;
-		ConsumerAppID = 0;
-		VotesUp = 0;
-		VotesDown = 0;
-		CalculatedScore = 0.f;
-		bBanned = false;
-		bAcceptedForUse = false;
-		bTagsTruncated = false;
 	}
 
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 	FBPSteamWorkshopItemDetails(SteamUGCDetails_t &hUGCDetails)
 	{
 		ResultOfRequest = (FBPSteamResult)hUGCDetails.m_eResult;
@@ -258,7 +245,6 @@ public:
 
 		CreatorSteamID = FString::Printf(TEXT("%llu"), hUGCDetails.m_ulSteamIDOwner);
 	}
-#endif
 
 	// Result of obtaining the details
 	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Online|AdvancedSteamWorkshop")

AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h

@@ -77,7 +77,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);
 

AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp

@@ -2,6 +2,45 @@
 #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)
+// #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")
+
+#endif
+
+// @todo Steam: See above
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 //General Log
 DEFINE_LOG_CATEGORY(AdvancedSteamFriendsLog);
 
@@ -58,7 +97,6 @@ DEFINE_LOG_CATEGORY(AdvancedSteamFriendsLog);
 
 void UAdvancedSteamFriendsLibrary::GetSteamGroups(TArray<FBPSteamGroupInfo> & SteamGroups)
 {
-	
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 
 	if (SteamAPI_Init())
@@ -74,7 +112,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,10 +122,9 @@ 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
@@ -109,15 +146,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
+			char NameBuffer[512];
-			// And it would only find games in the local library anyway
-			/*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;
@@ -185,7 +220,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,21 +231,6 @@ FBPUniqueNetId UAdvancedSteamFriendsLibrary::CreateSteamIDFromString(const FStri
 	return netId;
 }
 
-FBPUniqueNetId UAdvancedSteamFriendsLibrary::GetLocalSteamIDFromSteam()
-{
-	FBPUniqueNetId netId;
-
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
-	if (SteamAPI_Init())
-	{
-		TSharedPtr<const FUniqueNetId> SteamID(new const FUniqueNetIdSteam2(SteamUser()->GetSteamID()));
-		netId.SetUniqueNetId(SteamID);
-	}
-#endif
-
-	return netId;
-}
-
 bool UAdvancedSteamFriendsLibrary::RequestSteamFriendInfo(const FBPUniqueNetId UniqueNetId, bool bRequireNameOnly)
 {
 #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX

AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp

@@ -1,12 +1,9 @@
 // Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
 
 #include "SteamRequestGroupOfficersCallbackProxy.h"
-#include "UObject/CoreOnline.h"
+#include "CoreOnline.h"
-#include "AdvancedSteamFriendsLibrary.h"
 #include "OnlineSubSystemHeader.h"
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
+#include "OnlineSubsystemSteamTypes.h"
-#endif
-//#include "OnlineSubsystemSteamTypes.h"
 
 //////////////////////////////////////////////////////////////////////////
 // UEndSessionCallbackProxy
@@ -44,11 +41,12 @@ void USteamRequestGroupOfficersCallbackProxy::Activate()
 	OnFailure.Broadcast(EmptyArray);
 }
 
-#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
 void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanOfficerListResponse_t *pResult, bool bIOFailure)
 {
 	TArray<FBPSteamGroupOfficer> OfficerArray;
 
+#if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX
+	
 	FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM));
 
 	if (bIOFailure || !pResult || !pResult->m_bSuccess)
@@ -74,7 +72,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);
 
@@ -84,7 +82,7 @@ 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);
@@ -112,9 +110,9 @@ void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanO
 			});
 		}
 	}
+#endif
 
 	// Should never hit this anyway
 	//OnFailure.Broadcast(OfficerArray);
 }
-#endif
 

AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp

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

README.md

@@ -1,7 +1 @@
-### How do I use it? ###
+Readme and documentation will be worked on soon
-
-**KantanDocGen Automatic Documentation ([KantanDocGen](http://kantandev.com/free/kantan-doc-gen))** 
-
-**[AdvancedSessions](https://mordentral.bitbucket.io/AdvancedSessions/Advanced)**
-
-**[AdvancedSteamSessions](https://mordentral.bitbucket.io/AdvancedSteamSessions/Advanced)**