fixed deprecating function call

Former-commit-id: ab173e553696c0d4831c429d2c88683f3ac2aa53

.gitignore

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

AdvancedSessions/AdvancedSessions.uplugin

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

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h

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

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h

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

AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h

@@ -2,7 +2,6 @@
 
 #pragma once
 #include "CoreMinimal.h"
-#include "Engine/Engine.h"
 #include "BlueprintDataDefinitions.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
 #include "Online.h"
@@ -14,9 +13,6 @@
 #include "Engine/GameInstance.h"
 #include "Interfaces/OnlineSessionInterface.h"
 
-#include "GameFramework/GameModeBase.h"
-#include "GameFramework/GameSession.h"
-
 //#include "UObjectIterator.h"
 
 #include "AdvancedSessionsLibrary.generated.h"
@@ -31,17 +27,6 @@ class UAdvancedSessionsLibrary : public UBlueprintFunctionLibrary
 {
 	GENERATED_BODY()
 public:
-		//********* Session Admin Functions *************//	
-
-		// Kick a player from the currently active game session, only available on the server
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions", meta = (WorldContext = "WorldContextObject"))
-		static bool KickPlayer(UObject* WorldContextObject, APlayerController* PlayerToKick, FText KickReason);
-
-		// Ban a player from the currently active game session, only available on the server
-		// Note that the default gamesession class does not implement an actual ban list and just kicks when this is called
-		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions", meta = (WorldContext = "WorldContextObject"))
-		static bool BanPlayer(UObject* WorldContextObject, APlayerController* PlayerToBan, FText BanReason);
-
 		//********* Session Search Functions *************//	
 
 		// Adds or modifies session settings in an existing array depending on if they exist already or not
@@ -115,7 +100,6 @@ public:
 		static void GetSessionPropertyByte(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, uint8 &SettingValue);
 
 		// Get session custom information key/value as Bool
-		// Steam only currently supports Int,Float,String,BYTE values for search filtering!!!
 		UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult"))
 		static void GetSessionPropertyBool(const TArray<FSessionPropertyKeyPair> & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, bool &SettingValue);
 
@@ -137,7 +121,6 @@ public:
 		static FSessionPropertyKeyPair MakeLiteralSessionPropertyByte(FName Key, uint8 Value);
 
 		// Make a literal session custom information key/value pair from Bool
-		// Steam only currently supports Int,Float,String,BYTE values for search filtering!
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo|Literals")
 		static FSessionPropertyKeyPair MakeLiteralSessionPropertyBool(FName Key, bool Value);
 
@@ -200,11 +183,5 @@ public:
 		UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|Misc")
 		static bool HasOnlineSubsystem(FName SubSystemName);
 
-		//**** Seamless travel Functions ****//
-		
-		//Exposes Server travel to blueprint
-		UFUNCTION(BlueprintCallable, BlueprintAuthorityOnly, Category = "Online|AdvancedSessions|Seamless", meta = (HidePin = "WorldContextObject", DefaultToSelf = "WorldContextObject"))
-		static bool ServerTravel(UObject* WorldContextObject, const FString& InURL, bool bAbsolute, bool bShouldSkipGameNotify);
-
 		
 };	

AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h

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

AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h

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

AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h

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

AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h

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

AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h

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

AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp

@@ -1,48 +1,12 @@
 // 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();
@@ -528,14 +492,3 @@ void UAdvancedSessionsLibrary::GetNumberOfNetworkPlayers(UObject* WorldContextOb
 
 	NumNetPlayers = TheWorld->GetGameState()->PlayerArray.Num();
 }
-
-bool UAdvancedSessionsLibrary::ServerTravel(UObject* WorldContextObject, const FString& FURL, bool bAbsolute, bool bShouldSkipGameNotify)
-{
-	if (!WorldContextObject) return false;
-
-	//using a context object to get the world
-	UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::ReturnNull);
-	if (!World) return false;
-	World->ServerTravel(FURL,bAbsolute,bShouldSkipGameNotify);
-	return true;
-}

AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp

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

AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp

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

AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp

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

AdvancedSteamSessions/AdvancedSteamSessions.uplugin

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

AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h

@@ -242,7 +242,6 @@ DECLARE_LOG_CATEGORY_EXTERN(AdvancedSteamFriendsLog, Log, All);
 UENUM(Blueprintable)
 enum class SteamAvatarSize : uint8
 {
-	SteamAvatar_INVALID = 0,
 	SteamAvatar_Small = 1,
 	SteamAvatar_Medium = 2,
 	SteamAvatar_Large = 3

AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h

@@ -83,7 +83,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

AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp

@@ -328,7 +328,7 @@ UTexture2D * UAdvancedSteamFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueN
 			delete[] oAvatarRGBA;
 
 			//Setting some Parameters for the Texture and finally returning it
-			Avatar->PlatformData->SetNumSlices(1);
+			Avatar->PlatformData->NumSlices = 1;
 			Avatar->NeverStream = true;
 			//Avatar->CompressionSettings = TC_EditorIcon;