From d234ef1735b38fb5aef30b4361c201c737b90989 Mon Sep 17 00:00:00 2001 From: mordentral Date: Fri, 21 Oct 2016 11:04:27 -0400 Subject: [PATCH] Removed old style enums in favor of strongly typed enums Former-commit-id: 0a33d916dbc0e318c63472c0768a0f934af31857 --- .../AdvancedSessions.Build.cs | 2 +- .../Classes/AdvancedExternalUILibrary.h | 12 +- .../Classes/AdvancedFriendsLibrary.h | 6 +- .../Classes/AdvancedSessionsLibrary.h | 16 +-- .../Classes/BlueprintDataDefinitions.h | 134 ++++++++---------- .../FindSessionsCallbackProxyAdvanced.h | 6 +- .../Classes/GetFriendsCallbackProxy.h | 2 +- .../Private/AdvancedExternalUILibrary.cpp | 44 +++--- .../Private/AdvancedFriendsLibrary.cpp | 42 +++--- .../Private/AdvancedSessionsLibrary.cpp | 54 +++---- .../Private/AdvancedVoiceLibrary.cpp | 2 +- .../FindSessionsCallbackProxyAdvanced.cpp | 4 +- .../Private/GetFriendsCallbackProxy.cpp | 6 +- .../Private/SendFriendInviteCallbackProxy.cpp | 2 +- 14 files changed, 157 insertions(+), 175 deletions(-) diff --git a/Source/AdvancedSessions/AdvancedSessions.Build.cs b/Source/AdvancedSessions/AdvancedSessions.Build.cs index 12fbcdd..78d9e03 100644 --- a/Source/AdvancedSessions/AdvancedSessions.Build.cs +++ b/Source/AdvancedSessions/AdvancedSessions.Build.cs @@ -12,7 +12,7 @@ public class AdvancedSessions : ModuleRules if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32) || (Target.Platform == UnrealTargetPlatform.Linux) || (Target.Platform == UnrealTargetPlatform.Mac)) { - PublicDependencyModuleNames.AddRange(new string[] { "Steamworks"/*"Voice", "OnlineSubsystemSteam"*/ }); + PublicDependencyModuleNames.AddRange(new string[] { "Steamworks"/*,"Voice", "OnlineSubsystemSteam"*/ }); } } } \ No newline at end of file diff --git a/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h b/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h index 956f46d..84f0122 100644 --- a/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h +++ b/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h @@ -31,19 +31,19 @@ public: // Show the UI that handles the Friends list UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result")) - static void ShowFriendsUI(APlayerController *PlayerController, TEnumAsByte &Result); + static void ShowFriendsUI(APlayerController *PlayerController, EBlueprintResultSwitch &Result); // Show the UI that handles inviting people to your game UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result")) - static void ShowInviteUI(APlayerController *PlayerController, TEnumAsByte &Result); + static void ShowInviteUI(APlayerController *PlayerController, EBlueprintResultSwitch &Result); // Show the UI that shows the leaderboard (doesn't work with steam) UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result")) - static void ShowLeaderBoardUI(FString LeaderboardName, TEnumAsByte &Result); + static void ShowLeaderBoardUI(FString LeaderboardName, EBlueprintResultSwitch &Result); // Show the UI that shows a web URL UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result", AutoCreateRefTerm = "AllowedDomains")) - static void ShowWebURLUI(FString URLToShow, TEnumAsByte &Result, TArray& AllowedDomains, bool bEmbedded = false , bool bShowBackground = false, bool bShowCloseButton = false, int32 OffsetX = 0, int32 OffsetY = 0, int32 SizeX = 0, int32 SizeY = 0); + static void ShowWebURLUI(FString URLToShow, EBlueprintResultSwitch &Result, TArray& AllowedDomains, bool bEmbedded = false , bool bShowBackground = false, bool bShowCloseButton = false, int32 OffsetX = 0, int32 OffsetY = 0, int32 SizeX = 0, int32 SizeY = 0); // Show the UI that shows a web URL UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI") @@ -52,10 +52,10 @@ public: // Show the UI that shows the profile of a uniquenetid UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result")) - static void ShowProfileUI(const FBPUniqueNetId PlayerViewingProfile, const FBPUniqueNetId PlayerToViewProfileOf, TEnumAsByte &Result); + static void ShowProfileUI(const FBPUniqueNetId PlayerViewingProfile, const FBPUniqueNetId PlayerToViewProfileOf, EBlueprintResultSwitch &Result); // Show the UI that shows the account upgrade UI (doesn't work with steam) UFUNCTION(BlueprintCallable, Category = "Online|AdvancedExternalUI", meta = (ExpandEnumAsExecs = "Result")) - static void ShowAccountUpgradeUI(const FBPUniqueNetId PlayerRequestingAccountUpgradeUI, TEnumAsByte &Result); + static void ShowAccountUpgradeUI(const FBPUniqueNetId PlayerRequestingAccountUpgradeUI, EBlueprintResultSwitch &Result); }; diff --git a/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h b/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h index 48eb676..6850c95 100644 --- a/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h +++ b/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h @@ -21,7 +21,7 @@ DECLARE_LOG_CATEGORY_EXTERN(AdvancedFriendsLog, Log, All); UENUM(Blueprintable) -enum SteamAvatarSize +enum class SteamAvatarSize : uint8 { SteamAvatar_Small = 1, SteamAvatar_Medium = 2, @@ -39,11 +39,11 @@ public: // Sends an Invite to the current online session to a list of friends UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|FriendsList", meta = (ExpandEnumAsExecs = "Result")) - static void SendSessionInviteToFriends(APlayerController *PlayerController, const TArray &Friends, TEnumAsByte &Result); + static void SendSessionInviteToFriends(APlayerController *PlayerController, const TArray &Friends, EBlueprintResultSwitch &Result); // Sends an Invite to the current online session to a friend UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|FriendsList", meta = (ExpandEnumAsExecs = "Result")) - static void SendSessionInviteToFriend(APlayerController *PlayerController, const FBPUniqueNetId &FriendUniqueNetId, TEnumAsByte &Result); + static void SendSessionInviteToFriend(APlayerController *PlayerController, const FBPUniqueNetId &FriendUniqueNetId, EBlueprintResultSwitch &Result); // Get a friend from the previously read/saved friends list (Must Call GetFriends first for this to return anything) UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|FriendsList") diff --git a/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h b/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h index 4b25ba5..bf5c1e8 100644 --- a/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h +++ b/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h @@ -38,11 +38,11 @@ public: // Get the current session state UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo") - static void GetSessionState(TEnumAsByte &SessionState); + static void GetSessionState(EBPOnlineSessionState &SessionState); // Get the current session settings 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 &ExtraSettings, TEnumAsByte &Result); + static void GetSessionSettings(int32 &NumConnections, int32 &NumPrivateConnections, bool &bIsLAN, bool &bIsDedicated, bool &bAllowInvites, bool &bAllowJoinInProgress, bool &bIsAnticheatEnabled, int32 &BuildUniqueID, TArray &ExtraSettings, EBlueprintResultSwitch &Result); // Check if someone is in the current session UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo") @@ -50,7 +50,7 @@ public: // Make a literal session search parameter UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|SessionInfo|Literals") - static FSessionsSearchSetting MakeLiteralSessionSearchProperty(FSessionPropertyKeyPair SessionSearchProperty, EOnlineComparisonOpRedux::Type ComparisonOp); + static FSessionsSearchSetting MakeLiteralSessionSearchProperty(FSessionPropertyKeyPair SessionSearchProperty, EOnlineComparisonOpRedux ComparisonOp); //********* Session Information Functions ***********// @@ -69,23 +69,23 @@ public: // Get session custom information key/value as Byte (For Enums) UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult")) - static void GetSessionPropertyByte(const TArray & ExtraSettings, FName SettingName, TEnumAsByte &SearchResult, uint8 &SettingValue); + static void GetSessionPropertyByte(const TArray & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, uint8 &SettingValue); // Get session custom information key/value as Bool UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult")) - static void GetSessionPropertyBool(const TArray & ExtraSettings, FName SettingName, TEnumAsByte &SearchResult, bool &SettingValue); + static void GetSessionPropertyBool(const TArray & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, bool &SettingValue); // Get session custom information key/value as String UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult")) - static void GetSessionPropertyString(const TArray & ExtraSettings, FName SettingName, TEnumAsByte &SearchResult, FString &SettingValue); + static void GetSessionPropertyString(const TArray & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, FString &SettingValue); // Get session custom information key/value as Int UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult")) - static void GetSessionPropertyInt(const TArray & ExtraSettings, FName SettingName, TEnumAsByte &SearchResult, int32 &SettingValue); + static void GetSessionPropertyInt(const TArray & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, int32 &SettingValue); // Get session custom information key/value as Float UFUNCTION(BlueprintCallable, Category = "Online|AdvancedSessions|SessionInfo", meta = (ExpandEnumAsExecs = "SearchResult")) - static void GetSessionPropertyFloat(const TArray & ExtraSettings, FName SettingName, TEnumAsByte &SearchResult, float &SettingValue); + static void GetSessionPropertyFloat(const TArray & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, float &SettingValue); // Make a literal session custom information key/value pair from Byte (For Enums) diff --git a/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h b/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h index 97869bc..0edf066 100644 --- a/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h +++ b/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h @@ -15,85 +15,70 @@ UENUM() -namespace ESessionSettingSearchResult +enum class ESessionSettingSearchResult : uint8 { - enum Type - { - // Found the setting - Found, + // Found the setting + Found, - // Did not find the setting - NotFound, + // Did not find the setting + NotFound, - // Was not the correct ype - WrongType - }; -} + // Was not the correct ype + WrongType +}; // This makes a lot of the blueprint functions cleaner UENUM() -namespace EBlueprintResultSwitch +enum class EBlueprintResultSwitch : uint8 { - enum Type - { - // On Success - OnSuccess, + // On Success + OnSuccess, - // On Failure - OnFailure - }; -} + // On Failure + OnFailure +}; // This is to define server type searches UENUM(BlueprintType) -namespace EBPServerPresenceSearchType +enum class EBPServerPresenceSearchType : uint8 { - enum Type - { - ClientServersOnly, - DedicatedServersOnly, - AllServers - }; -} + ClientServersOnly, + DedicatedServersOnly, + AllServers +}; // Wanted this to be switchable in the editor UENUM(BlueprintType) -namespace EBPOnlinePresenceState +enum class EBPOnlinePresenceState : uint8 { - enum Type - { - Online, - Offline, - Away, - ExtendedAway, - DoNotDisturb, - Chat - }; -} + Online, + Offline, + Away, + ExtendedAway, + DoNotDisturb, + Chat +}; UENUM(BlueprintType) -namespace EBPOnlineSessionState +enum class EBPOnlineSessionState : uint8 { - enum Type - { - /** An online session has not been created yet */ - NoSession, - /** An online session is in the process of being created */ - Creating, - /** Session has been created but the session hasn't started (pre match lobby) */ - Pending, - /** Session has been asked to start (may take time due to communication with backend) */ - Starting, - /** The current session has started. Sessions with join in progress disabled are no longer joinable */ - InProgress, - /** The session is still valid, but the session is no longer being played (post match lobby) */ - Ending, - /** The session is closed and any stats committed */ - Ended, - /** The session is being destroyed */ - Destroying - }; -} + /** An online session has not been created yet */ + NoSession, + /** An online session is in the process of being created */ + Creating, + /** Session has been created but the session hasn't started (pre match lobby) */ + Pending, + /** Session has been asked to start (may take time due to communication with backend) */ + Starting, + /** The current session has started. Sessions with join in progress disabled are no longer joinable */ + InProgress, + /** The session is still valid, but the session is no longer being played (post match lobby) */ + Ending, + /** The session is closed and any stats committed */ + Ended, + /** The session is being destroyed */ + Destroying +}; // Boy oh boy is this a dirty hack, but I can't figure out a good way to do it otherwise at the moment // The UniqueNetId is an abstract class so I can't exactly re-initialize it to make a shared pointer on some functions @@ -205,7 +190,7 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend") bool bHasVoiceSupport; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend") - TEnumAsByte PresenceState; + EBPOnlinePresenceState PresenceState; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend") FString StatusString; }; @@ -224,7 +209,7 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend") FString RealName; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend") - TEnumAsByte OnlineState; + EBPOnlinePresenceState OnlineState; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend") FBPUniqueNetId UniqueNetId; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Online|Friend") @@ -236,18 +221,15 @@ public: /** The types of comparison operations for a given search query */ // Used to compare session properties UENUM(BlueprintType) -namespace EOnlineComparisonOpRedux +enum class EOnlineComparisonOpRedux : uint8 { - enum Type - { - Equals, - NotEquals, - GreaterThan, - GreaterThanEquals, - LessThan, - LessThanEquals, - }; -} + Equals, + NotEquals, + GreaterThan, + GreaterThanEquals, + LessThan, + LessThanEquals, +}; // Used to store session properties before converting to FVariantData @@ -271,7 +253,7 @@ struct FSessionsSearchSetting // Had to make a copy of this to account for the original not being exposed to blueprints /** How is this session setting compared on the backend searches */ - TEnumAsByte ComparisonOp; + EOnlineComparisonOpRedux ComparisonOp; // The key pair to search for FSessionPropertyKeyPair PropertyKeyPair; @@ -333,11 +315,11 @@ class FOnlineSearchSettingsEx : public FOnlineSearchSettings */ public: - void HardSet(FName Key, const FVariantData& Value, EOnlineComparisonOpRedux::Type CompOp) + void HardSet(FName Key, const FVariantData& Value, EOnlineComparisonOpRedux CompOp) { FOnlineSessionSearchParam* SearchParam = SearchParams.Find(Key); - EOnlineComparisonOp::Type op; + TEnumAsByte op; switch (CompOp) { diff --git a/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h b/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h index 55daee6..6b09526 100644 --- a/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h +++ b/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h @@ -21,9 +21,9 @@ 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, TEnumAsByte ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly = false, bool bNonEmptyServersOnly = false, bool bSecureServersOnly = false, int MinSlotsAvailable = 0); + static UFindSessionsCallbackProxyAdvanced* FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int32 MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly = false, bool bNonEmptyServersOnly = false, bool bSecureServersOnly = false, int MinSlotsAvailable = 0); - static bool CompareVariants(const FVariantData &A, const FVariantData &B, EOnlineComparisonOpRedux::Type Comparator); + static bool CompareVariants(const FVariantData &A, const FVariantData &B, EOnlineComparisonOpRedux Comparator); // Filters an array of session results by the given search parameters, returns a new array with the filtered results UFUNCTION(BluePrintCallable, meta = (Category = "Online|AdvancedSessions")) @@ -68,7 +68,7 @@ private: bool bUseLAN; // Whether or not to search for dedicated servers - EBPServerPresenceSearchType::Type ServerSearchType; + EBPServerPresenceSearchType ServerSearchType; // Maximum number of results to return int MaxResults; diff --git a/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h b/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h index 1dfadbf..9d495c5 100644 --- a/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h +++ b/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h @@ -40,7 +40,7 @@ private: // The Type of friends list to get // Removed because all but the facebook interfaces don't even currently support anything but the default friends list. - //EBPFriendsLists::Type FriendListToGet; + //EBPFriendsLists FriendListToGet; // The world context object in which this call is taking place UObject* WorldContextObject; diff --git a/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp b/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp index d3ed15c..7b6912d 100644 --- a/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp +++ b/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp @@ -5,22 +5,22 @@ //General Log DEFINE_LOG_CATEGORY(AdvancedExternalUILog); -void UAdvancedExternalUILibrary::ShowAccountUpgradeUI(const FBPUniqueNetId PlayerRequestingAccountUpgradeUI, TEnumAsByte &Result) +void UAdvancedExternalUILibrary::ShowAccountUpgradeUI(const FBPUniqueNetId PlayerRequestingAccountUpgradeUI, EBlueprintResultSwitch &Result) { IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(); if (!ExternalUIInterface.IsValid()) { UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowAccountUpgradeUI Failed to get External UI interface!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } ExternalUIInterface->ShowAccountUpgradeUI(*PlayerRequestingAccountUpgradeUI.GetUniqueNetId()); - Result = EBlueprintResultSwitch::Type::OnSuccess; + Result = EBlueprintResultSwitch::OnSuccess; } -void UAdvancedExternalUILibrary::ShowProfileUI(const FBPUniqueNetId PlayerViewingProfile, const FBPUniqueNetId PlayerToViewProfileOf, TEnumAsByte &Result) +void UAdvancedExternalUILibrary::ShowProfileUI(const FBPUniqueNetId PlayerViewingProfile, const FBPUniqueNetId PlayerToViewProfileOf, EBlueprintResultSwitch &Result) { IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(); @@ -28,24 +28,24 @@ void UAdvancedExternalUILibrary::ShowProfileUI(const FBPUniqueNetId PlayerViewin if (!ExternalUIInterface.IsValid()) { UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowProfileUI Failed to get External UI interface!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } ExternalUIInterface->ShowProfileUI(*PlayerViewingProfile.GetUniqueNetId(), *PlayerToViewProfileOf.GetUniqueNetId(), NULL); - Result = EBlueprintResultSwitch::Type::OnSuccess; + Result = EBlueprintResultSwitch::OnSuccess; } -void UAdvancedExternalUILibrary::ShowWebURLUI(FString URLToShow, TEnumAsByte &Result, TArray& AllowedDomains, bool bEmbedded, bool bShowBackground, bool bShowCloseButton, int32 OffsetX, int32 OffsetY, int32 SizeX, int32 SizeY) +void UAdvancedExternalUILibrary::ShowWebURLUI(FString URLToShow, EBlueprintResultSwitch &Result, TArray& AllowedDomains, bool bEmbedded, bool bShowBackground, bool bShowCloseButton, int32 OffsetX, int32 OffsetY, int32 SizeX, int32 SizeY) { IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(); if (!ExternalUIInterface.IsValid()) { UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowWebURLUI Failed to get External UI interface!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -63,7 +63,7 @@ void UAdvancedExternalUILibrary::ShowWebURLUI(FString URLToShow, TEnumAsByteShowWebURL(URLToShow, Params); - Result = EBlueprintResultSwitch::Type::OnSuccess; + Result = EBlueprintResultSwitch::OnSuccess; } void UAdvancedExternalUILibrary::CloseWebURLUI() @@ -79,29 +79,29 @@ void UAdvancedExternalUILibrary::CloseWebURLUI() ExternalUIInterface->CloseWebURL(); } -void UAdvancedExternalUILibrary::ShowLeaderBoardUI(FString LeaderboardName, TEnumAsByte &Result) +void UAdvancedExternalUILibrary::ShowLeaderBoardUI(FString LeaderboardName, EBlueprintResultSwitch &Result) { IOnlineExternalUIPtr ExternalUIInterface = Online::GetExternalUIInterface(); if (!ExternalUIInterface.IsValid()) { UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowLeaderboardsUI Failed to get External UI interface!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } ExternalUIInterface->ShowLeaderboardUI(LeaderboardName); - Result = EBlueprintResultSwitch::Type::OnSuccess; + Result = EBlueprintResultSwitch::OnSuccess; } -void UAdvancedExternalUILibrary::ShowInviteUI(APlayerController *PlayerController, TEnumAsByte &Result) +void UAdvancedExternalUILibrary::ShowInviteUI(APlayerController *PlayerController, EBlueprintResultSwitch &Result) { if (!PlayerController) { UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowInviteUI Had a bad Player Controller!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -110,7 +110,7 @@ void UAdvancedExternalUILibrary::ShowInviteUI(APlayerController *PlayerControlle if (!ExternalUIInterface.IsValid()) { UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowInviteUI Failed to get External UI interface!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -119,20 +119,20 @@ void UAdvancedExternalUILibrary::ShowInviteUI(APlayerController *PlayerControlle if (!Player) { UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowInviteUI Failed to get ULocalPlayer for the given PlayerController!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } ExternalUIInterface->ShowInviteUI(Player->GetControllerId(), GameSessionName); - Result = EBlueprintResultSwitch::Type::OnSuccess; + Result = EBlueprintResultSwitch::OnSuccess; } -void UAdvancedExternalUILibrary::ShowFriendsUI(APlayerController *PlayerController, TEnumAsByte &Result) +void UAdvancedExternalUILibrary::ShowFriendsUI(APlayerController *PlayerController, EBlueprintResultSwitch &Result) { if (!PlayerController) { UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowFriendsUI Had a bad Player Controller!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -141,7 +141,7 @@ void UAdvancedExternalUILibrary::ShowFriendsUI(APlayerController *PlayerControll if (!ExternalUIInterface.IsValid()) { UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowFriendsUI Failed to get External UI interface!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -150,10 +150,10 @@ void UAdvancedExternalUILibrary::ShowFriendsUI(APlayerController *PlayerControll if (!Player) { UE_LOG(AdvancedExternalUILog, Warning, TEXT("ShowFriendsUI Failed to get ULocalPlayer for the given PlayerController!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } ExternalUIInterface->ShowFriendsUI(Player->GetControllerId()); - Result = EBlueprintResultSwitch::Type::OnSuccess; + Result = EBlueprintResultSwitch::OnSuccess; } \ No newline at end of file diff --git a/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp b/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp index 4afd077..1ea235a 100644 --- a/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp +++ b/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp @@ -165,19 +165,19 @@ UTexture2D * UAdvancedFriendsLibrary::GetSteamFriendAvatar(const FBPUniqueNetId return nullptr; } -void UAdvancedFriendsLibrary::SendSessionInviteToFriends(APlayerController *PlayerController, const TArray &Friends, TEnumAsByte &Result) +void UAdvancedFriendsLibrary::SendSessionInviteToFriends(APlayerController *PlayerController, const TArray &Friends, EBlueprintResultSwitch &Result) { if (!PlayerController) { UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Had a bad Player Controller!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } if (Friends.Num() < 1) { UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Had no friends in invitation array!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -186,7 +186,7 @@ void UAdvancedFriendsLibrary::SendSessionInviteToFriends(APlayerController *Play if (!SessionInterface.IsValid()) { UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Failed to get session interface!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -195,7 +195,7 @@ void UAdvancedFriendsLibrary::SendSessionInviteToFriends(APlayerController *Play if (!Player) { UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend failed to get LocalPlayer!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -209,27 +209,27 @@ void UAdvancedFriendsLibrary::SendSessionInviteToFriends(APlayerController *Play if (SessionInterface->SendSessionInviteToFriends(Player->GetControllerId(), GameSessionName, List)) { - Result = EBlueprintResultSwitch::Type::OnSuccess; + Result = EBlueprintResultSwitch::OnSuccess; return; } - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } -void UAdvancedFriendsLibrary::SendSessionInviteToFriend(APlayerController *PlayerController, const FBPUniqueNetId &FriendUniqueNetId, TEnumAsByte &Result) +void UAdvancedFriendsLibrary::SendSessionInviteToFriend(APlayerController *PlayerController, const FBPUniqueNetId &FriendUniqueNetId, EBlueprintResultSwitch &Result) { if (!PlayerController) { UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Had a bad Player Controller!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } if (!FriendUniqueNetId.IsValid()) { UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Had a bad UniqueNetId!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -238,7 +238,7 @@ void UAdvancedFriendsLibrary::SendSessionInviteToFriend(APlayerController *Playe if (!SessionInterface.IsValid()) { UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend Failed to get session interface!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -247,17 +247,17 @@ void UAdvancedFriendsLibrary::SendSessionInviteToFriend(APlayerController *Playe if (!Player) { UE_LOG(AdvancedFriendsLog, Warning, TEXT("SendSessionInviteToFriend failed to get LocalPlayer!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } if (SessionInterface->SendSessionInviteToFriend(Player->GetControllerId(), GameSessionName, *FriendUniqueNetId.GetUniqueNetId())) { - Result = EBlueprintResultSwitch::Type::OnSuccess; + Result = EBlueprintResultSwitch::OnSuccess; return; } - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -292,12 +292,12 @@ void UAdvancedFriendsLibrary::GetFriend(APlayerController *PlayerController, con return; } - TSharedPtr fr = FriendsInterface->GetFriend(Player->GetControllerId(), *FriendUniqueNetId.GetUniqueNetId(), EFriendsLists::ToString(EFriendsLists::Type::Default)); + TSharedPtr fr = FriendsInterface->GetFriend(Player->GetControllerId(), *FriendUniqueNetId.GetUniqueNetId(), EFriendsLists::ToString(EFriendsLists::Default)); if (fr.IsValid()) { FOnlineUserPresence pres = fr->GetPresence(); Friend.DisplayName = fr->GetDisplayName(); - Friend.OnlineState = ((EBPOnlinePresenceState::Type)((int32)pres.Status.State)); + Friend.OnlineState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); Friend.RealName = fr->GetRealName(); Friend.UniqueNetId.SetUniqueNetId(fr->GetUserId()); Friend.bIsPlayingSameGame = pres.bIsPlayingThisGame; @@ -307,7 +307,7 @@ void UAdvancedFriendsLibrary::GetFriend(APlayerController *PlayerController, con Friend.PresenceInfo.bIsOnline = pres.bIsOnline; Friend.PresenceInfo.bIsPlaying = pres.bIsPlaying; Friend.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; - Friend.PresenceInfo.PresenceState = ((EBPOnlinePresenceState::Type)((int32)pres.Status.State)); + Friend.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); Friend.PresenceInfo.StatusString = pres.Status.StatusStr; } } @@ -342,7 +342,7 @@ void UAdvancedFriendsLibrary::IsAFriend(APlayerController *PlayerController, con return; } - IsFriend = FriendsInterface->IsFriend(Player->GetControllerId(), *UniqueNetId.GetUniqueNetId(), EFriendsLists::ToString(EFriendsLists::Type::Default)); + IsFriend = FriendsInterface->IsFriend(Player->GetControllerId(), *UniqueNetId.GetUniqueNetId(), EFriendsLists::ToString(EFriendsLists::Default)); } void UAdvancedFriendsLibrary::GetStoredRecentPlayersList(FBPUniqueNetId UniqueNetId, TArray &PlayersList) @@ -404,7 +404,7 @@ void UAdvancedFriendsLibrary::GetStoredFriendsList(APlayerController *PlayerCont TArray< TSharedRef > FriendList; - FriendsInterface->GetFriendsList(Player->GetControllerId(), EFriendsLists::ToString((EFriendsLists::Type::Default)), FriendList); + FriendsInterface->GetFriendsList(Player->GetControllerId(), EFriendsLists::ToString((EFriendsLists::Default)), FriendList); for (int32 i = 0; i < FriendList.Num(); i++) { @@ -412,7 +412,7 @@ void UAdvancedFriendsLibrary::GetStoredFriendsList(APlayerController *PlayerCont FBPFriendInfo BPF; FOnlineUserPresence pres = Friend->GetPresence(); - BPF.OnlineState = ((EBPOnlinePresenceState::Type)((int32)pres.Status.State)); + BPF.OnlineState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); BPF.DisplayName = Friend->GetDisplayName(); BPF.RealName = Friend->GetRealName(); BPF.UniqueNetId.SetUniqueNetId(Friend->GetUserId()); @@ -421,7 +421,7 @@ void UAdvancedFriendsLibrary::GetStoredFriendsList(APlayerController *PlayerCont BPF.PresenceInfo.bIsOnline = pres.bIsOnline; BPF.PresenceInfo.bHasVoiceSupport = pres.bHasVoiceSupport; BPF.PresenceInfo.bIsPlaying = pres.bIsPlaying; - BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState::Type)((int32)pres.Status.State)); + BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); BPF.PresenceInfo.StatusString = pres.Status.StatusStr; BPF.PresenceInfo.bIsJoinable = pres.bIsJoinable; BPF.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; diff --git a/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp b/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp index abe47fa..b6caaaa 100644 --- a/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp +++ b/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp @@ -60,7 +60,7 @@ void UAdvancedSessionsLibrary::GetExtraSettings(FBlueprintSessionResult SessionR } } -void UAdvancedSessionsLibrary::GetSessionState(TEnumAsByte &SessionState) +void UAdvancedSessionsLibrary::GetSessionState(EBPOnlineSessionState &SessionState) { IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(); @@ -70,17 +70,17 @@ void UAdvancedSessionsLibrary::GetSessionState(TEnumAsByteGetSessionState(GameSessionName)); + SessionState = ((EBPOnlineSessionState)SessionInterface->GetSessionState(GameSessionName)); } -void UAdvancedSessionsLibrary::GetSessionSettings(int32 &NumConnections, int32 &NumPrivateConnections, bool &bIsLAN, bool &bIsDedicated, bool &bAllowInvites, bool &bAllowJoinInProgress, bool &bIsAnticheatEnabled, int32 &BuildUniqueID, TArray &ExtraSettings, TEnumAsByte &Result) +void UAdvancedSessionsLibrary::GetSessionSettings(int32 &NumConnections, int32 &NumPrivateConnections, bool &bIsLAN, bool &bIsDedicated, bool &bAllowInvites, bool &bAllowJoinInProgress, bool &bIsAnticheatEnabled, int32 &BuildUniqueID, TArray &ExtraSettings, EBlueprintResultSwitch &Result) { IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(); if (!SessionInterface.IsValid()) { UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetSessionSettings couldn't get the session interface!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -88,7 +88,7 @@ void UAdvancedSessionsLibrary::GetSessionSettings(int32 &NumConnections, int32 & if (!settings) { UE_LOG(AdvancedSessionsLog, Warning, TEXT("GetSessionSettings couldn't get the session settings!")); - Result = EBlueprintResultSwitch::Type::OnFailure; + Result = EBlueprintResultSwitch::OnFailure; return; } @@ -110,7 +110,7 @@ void UAdvancedSessionsLibrary::GetSessionSettings(int32 &NumConnections, int32 & ExtraSettings.Add(NewSetting); } - Result = EBlueprintResultSwitch::Type::OnSuccess; + Result = EBlueprintResultSwitch::OnSuccess; } void UAdvancedSessionsLibrary::IsPlayerInSession(const FBPUniqueNetId &PlayerToCheck, bool &bIsInSession) @@ -127,7 +127,7 @@ void UAdvancedSessionsLibrary::IsPlayerInSession(const FBPUniqueNetId &PlayerToC bIsInSession = SessionInterface->IsPlayerInSession(GameSessionName, *PlayerToCheck.GetUniqueNetId()); } -FSessionsSearchSetting UAdvancedSessionsLibrary::MakeLiteralSessionSearchProperty(FSessionPropertyKeyPair SessionSearchProperty, EOnlineComparisonOpRedux::Type ComparisonOp) +FSessionsSearchSetting UAdvancedSessionsLibrary::MakeLiteralSessionSearchProperty(FSessionPropertyKeyPair SessionSearchProperty, EOnlineComparisonOpRedux ComparisonOp) { FSessionsSearchSetting setting; setting.PropertyKeyPair = SessionSearchProperty; @@ -176,7 +176,7 @@ FSessionPropertyKeyPair UAdvancedSessionsLibrary::MakeLiteralSessionPropertyFloa return Prop; } -void UAdvancedSessionsLibrary::GetSessionPropertyByte(const TArray & ExtraSettings, FName SettingName, TEnumAsByte &SearchResult, uint8 &SettingValue) +void UAdvancedSessionsLibrary::GetSessionPropertyByte(const TArray & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, uint8 &SettingValue) { for (FSessionPropertyKeyPair itr : ExtraSettings) { @@ -187,21 +187,21 @@ void UAdvancedSessionsLibrary::GetSessionPropertyByte(const TArray & ExtraSettings, FName SettingName, TEnumAsByte &SearchResult, bool &SettingValue) +void UAdvancedSessionsLibrary::GetSessionPropertyBool(const TArray & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, bool &SettingValue) { for (FSessionPropertyKeyPair itr : ExtraSettings) { @@ -210,21 +210,21 @@ void UAdvancedSessionsLibrary::GetSessionPropertyBool(const TArray & ExtraSettings, FName SettingName, TEnumAsByte &SearchResult, FString &SettingValue) +void UAdvancedSessionsLibrary::GetSessionPropertyString(const TArray & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, FString &SettingValue) { for (FSessionPropertyKeyPair itr : ExtraSettings) { @@ -233,21 +233,21 @@ void UAdvancedSessionsLibrary::GetSessionPropertyString(const TArray & ExtraSettings, FName SettingName, TEnumAsByte &SearchResult, int32 &SettingValue) +void UAdvancedSessionsLibrary::GetSessionPropertyInt(const TArray & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, int32 &SettingValue) { for (FSessionPropertyKeyPair itr : ExtraSettings) { @@ -256,21 +256,21 @@ void UAdvancedSessionsLibrary::GetSessionPropertyInt(const TArray & ExtraSettings, FName SettingName, TEnumAsByte &SearchResult, float &SettingValue) +void UAdvancedSessionsLibrary::GetSessionPropertyFloat(const TArray & ExtraSettings, FName SettingName, ESessionSettingSearchResult &SearchResult, float &SettingValue) { for (FSessionPropertyKeyPair itr : ExtraSettings) { @@ -279,17 +279,17 @@ void UAdvancedSessionsLibrary::GetSessionPropertyFloat(const TArray ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly, bool bNonEmptyServersOnly, bool bSecureServersOnly, int MinSlotsAvailable) +UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly, bool bNonEmptyServersOnly, bool bSecureServersOnly, int MinSlotsAvailable) { UFindSessionsCallbackProxyAdvanced* Proxy = NewObject(); Proxy->PlayerControllerWeakPtr = PlayerController; @@ -232,7 +232,7 @@ void UFindSessionsCallbackProxyAdvanced::FilterSessionResults(const TArray(PlayerControllerWeakPtr->Player); - Friends->ReadFriendsList(Player->GetControllerId(), EFriendsLists::ToString((EFriendsLists::Type::Default)), FriendListReadCompleteDelegate); + Friends->ReadFriendsList(Player->GetControllerId(), EFriendsLists::ToString((EFriendsLists::Default)), FriendListReadCompleteDelegate); return; } @@ -64,7 +64,7 @@ void UGetFriendsCallbackProxy::OnReadFriendsListCompleted(int32 LocalUserNum, bo TSharedRef Friend = FriendList[i]; FBPFriendInfo BPF; FOnlineUserPresence pres = Friend->GetPresence(); - BPF.OnlineState = ((EBPOnlinePresenceState::Type)((int32)pres.Status.State)); + BPF.OnlineState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); BPF.DisplayName = Friend->GetDisplayName(); BPF.RealName = Friend->GetRealName(); BPF.UniqueNetId.SetUniqueNetId(Friend->GetUserId()); @@ -73,7 +73,7 @@ void UGetFriendsCallbackProxy::OnReadFriendsListCompleted(int32 LocalUserNum, bo BPF.PresenceInfo.bIsOnline = pres.bIsOnline; BPF.PresenceInfo.bHasVoiceSupport = pres.bHasVoiceSupport; BPF.PresenceInfo.bIsPlaying = pres.bIsPlaying; - BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState::Type)((int32)pres.Status.State)); + BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); BPF.PresenceInfo.StatusString = pres.Status.StatusStr; BPF.PresenceInfo.bIsJoinable = pres.bIsJoinable; BPF.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; diff --git a/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp b/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp index 0e25bd0..7490693 100644 --- a/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp +++ b/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp @@ -52,7 +52,7 @@ void USendFriendInviteCallbackProxy::Activate() return; } - Friends->SendInvite(Player->GetControllerId(), *cUniqueNetId.GetUniqueNetId(), EFriendsLists::ToString((EFriendsLists::Type::Default)), OnSendInviteCompleteDelegate); + Friends->SendInvite(Player->GetControllerId(), *cUniqueNetId.GetUniqueNetId(), EFriendsLists::ToString((EFriendsLists::Default)), OnSendInviteCompleteDelegate); return; } // Fail immediately