From be280a6dfd3443889859e2c6ff2388f28d145793 Mon Sep 17 00:00:00 2001 From: mordentral Date: Tue, 10 Oct 2023 20:25:51 -0400 Subject: [PATCH] Removed the steam subsystem entirely from the advanced steam module Removed the steam subsystem entirely from the advanced steam module. In 5.3 it has a lot of issues with it for some reason, the steam subsystem is not loading if I directly reference it. Changes should also work in prior versions. --- .../AdvancedSteamSessions.uplugin | 6 +--- .../AdvancedSteamSessions.Build.cs | 4 +-- .../Classes/SteamNotificationsSubsystem.h | 4 +-- .../SteamRequestGroupOfficersCallbackProxy.h | 2 +- .../SteamWSRequestUGCDetailsCallbackProxy.h | 2 +- ...SteamRequestGroupOfficersCallbackProxy.cpp | 30 +++++++++---------- .../SteamWSRequestUGCDetailsCallbackProxy.cpp | 26 ++++++++-------- 7 files changed, 35 insertions(+), 39 deletions(-) diff --git a/AdvancedSteamSessions/AdvancedSteamSessions.uplugin b/AdvancedSteamSessions/AdvancedSteamSessions.uplugin index 0e21d6d..fda23d8 100644 --- a/AdvancedSteamSessions/AdvancedSteamSessions.uplugin +++ b/AdvancedSteamSessions/AdvancedSteamSessions.uplugin @@ -14,7 +14,7 @@ { "Name" : "AdvancedSteamSessions", "Type" : "RunTime", - "LoadingPhase" : "PreDefault" + "LoadingPhase" : "PostDefault" } ], "Plugins": [ @@ -30,10 +30,6 @@ "Name": "OnlineSubsystemUtils", "Enabled": true }, - { - "Name": "OnlineSubsystemSteam", - "Enabled": true - }, { "Name": "SteamShared", "Enabled": true diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs b/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs index 6e62e47..609d7b5 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs @@ -15,8 +15,8 @@ public class AdvancedSteamSessions : ModuleRules if ((Target.Platform == UnrealTargetPlatform.Win64) || (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 + PublicDependencyModuleNames.AddRange(new string[] { "Steamworks"/*, "OnlineSubsystemSteam"*/ }); + //PublicIncludePaths.AddRange(new string[] { "../Plugins/Online/OnlineSubsystemSteam/Source/Private" });// This is dumb but it isn't very open } } } \ No newline at end of file diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h index 7288f2b..d05d2db 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h @@ -7,8 +7,8 @@ #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX -#include "OnlineSubsystemSteam.h" -#include "OnlineSubsystemSteamPrivate.h" +//#include "OnlineSubsystemSteam.h" +//#include "OnlineSubsystemSteamPrivate.h" #include diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h index 85197ca..9c73a23 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h @@ -17,7 +17,7 @@ #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX -#include "OnlineSubsystemSteam.h" +//#include "OnlineSubsystemSteam.h" #pragma push_macro("ARRAY_COUNT") #undef ARRAY_COUNT diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h index 8b3b4ca..63d8c80 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h @@ -18,7 +18,7 @@ #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX -#include "OnlineSubsystemSteam.h" +//#include "OnlineSubsystemSteam.h" #pragma push_macro("ARRAY_COUNT") #undef ARRAY_COUNT diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp index 973ae02..337239c 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp @@ -50,17 +50,17 @@ void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanO { TArray OfficerArray; - FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM)); + //FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM)); if (bIOFailure || !pResult || !pResult->m_bSuccess) { - if (SteamSubsystem != nullptr) + //if (SteamSubsystem != nullptr) { - SteamSubsystem->ExecuteNextTick([this]() - { + // SteamSubsystem->ExecuteNextTick([this]() + //{ TArray FailureArray; OnFailure.Broadcast(FailureArray); - }); + //}); } //OnFailure.Broadcast(OfficerArray); return; @@ -91,26 +91,26 @@ void USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails(ClanO OfficerArray.Add(Officer); } - if (SteamSubsystem != nullptr) - { - SteamSubsystem->ExecuteNextTick([OfficerArray, this]() - { + //if (SteamSubsystem != nullptr) + //{ + //SteamSubsystem->ExecuteNextTick([OfficerArray, this]() + //{ OnSuccess.Broadcast(OfficerArray); - }); - } + //}); + //} //OnSuccess.Broadcast(OfficerArray); return; } else { - if (SteamSubsystem != nullptr) + //if (SteamSubsystem != nullptr) { - SteamSubsystem->ExecuteNextTick([this]() - { + //SteamSubsystem->ExecuteNextTick([this]() + //{ TArray FailureArray; OnFailure.Broadcast(FailureArray); - }); + //}); } } diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp index 9be98ca..95bee5c 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp @@ -52,16 +52,16 @@ void USteamWSRequestUGCDetailsCallbackProxy::Activate() #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX void USteamWSRequestUGCDetailsCallbackProxy::OnUGCRequestUGCDetails(SteamUGCQueryCompleted_t *pResult, bool bIOFailure) { - FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM)); + //FOnlineSubsystemSteam* SteamSubsystem = (FOnlineSubsystemSteam*)(IOnlineSubsystem::Get(STEAM_SUBSYSTEM)); if (bIOFailure || !pResult || pResult->m_unNumResultsReturned <= 0) { - if (SteamSubsystem != nullptr) + //if (SteamSubsystem != nullptr) { - SteamSubsystem->ExecuteNextTick([this]() - { + // SteamSubsystem->ExecuteNextTick([this]() + //{ OnFailure.Broadcast(FBPSteamWorkshopItemDetails()); - }); + //}); } //OnFailure.Broadcast(FBPSteamWorkshopItemDetails()); return; @@ -71,12 +71,12 @@ void USteamWSRequestUGCDetailsCallbackProxy::OnUGCRequestUGCDetails(SteamUGCQuer SteamUGCDetails_t Details; if (SteamUGC()->GetQueryUGCResult(pResult->m_handle, 0, &Details)) { - if (SteamSubsystem != nullptr) + //if (SteamSubsystem != nullptr) { - SteamSubsystem->ExecuteNextTick([Details, this]() - { + //SteamSubsystem->ExecuteNextTick([Details, this]() + //{ OnSuccess.Broadcast(FBPSteamWorkshopItemDetails(Details)); - }); + //}); } //OnSuccess.Broadcast(FBPSteamWorkshopItemDetails(Details)); @@ -85,12 +85,12 @@ void USteamWSRequestUGCDetailsCallbackProxy::OnUGCRequestUGCDetails(SteamUGCQuer } else { - if (SteamSubsystem != nullptr) + //if (SteamSubsystem != nullptr) { - SteamSubsystem->ExecuteNextTick([this]() - { + //SteamSubsystem->ExecuteNextTick([this]() + //{ OnFailure.Broadcast(FBPSteamWorkshopItemDetails()); - }); + //}); } }