diff --git a/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp b/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp index c08f469..8769cb8 100644 --- a/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp +++ b/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp @@ -423,7 +423,7 @@ void UAdvancedSessionsLibrary::GetNumberOfNetworkPlayers(UObject* WorldContextOb //~~~~~~~~~~~~ //Get World - UWorld* TheWorld = GEngine->GetWorldFromContextObject(WorldContextObject); + UWorld* TheWorld = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull); if (!TheWorld) { diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h index 011d362..5c38b5b 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h @@ -13,6 +13,8 @@ #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 @@ -20,8 +22,18 @@ #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 +#if USING_CODE_ANALYSIS +MSVC_PRAGMA(warning(pop)) +#endif // USING_CODE_ANALYSIS + + #pragma pop_macro("ARRAY_COUNT") #endif diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h index f3ba307..6e5e769 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h @@ -11,6 +11,8 @@ #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 @@ -18,12 +20,22 @@ #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 +#if USING_CODE_ANALYSIS +MSVC_PRAGMA(warning(pop)) +#endif // USING_CODE_ANALYSIS + + #pragma pop_macro("ARRAY_COUNT") -#endif - +#endif + // @todo Steam: See above #ifdef _MSC_VER #pragma warning(pop) @@ -53,6 +65,8 @@ class USteamRequestGroupOfficersCallbackProxy : public UOnlineBlueprintCallProxy { GENERATED_UCLASS_BODY() + virtual ~USteamRequestGroupOfficersCallbackProxy(); + // Called when there is a successful results return UPROPERTY(BlueprintAssignable) FBlueprintGroupOfficerDetailsDelegate OnSuccess; @@ -70,14 +84,15 @@ class USteamRequestGroupOfficersCallbackProxy : public UOnlineBlueprintCallProxy // End of UOnlineBlueprintCallProxyBase interface private: - + #if PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX void OnRequestGroupOfficerDetails( ClanOfficerListResponse_t *pResult, bool bIOFailure); CCallResult m_callResultGroupOfficerRequestDetails; + #endif private: FBPUniqueNetId GroupUniqueID; UObject* WorldContextObject; -}; +}; \ No newline at end of file diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h index 9d29f26..dc55f8a 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h @@ -12,6 +12,8 @@ #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 @@ -19,8 +21,18 @@ #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 +#if USING_CODE_ANALYSIS +MSVC_PRAGMA(warning(pop)) +#endif // USING_CODE_ANALYSIS + + #pragma pop_macro("ARRAY_COUNT") #endif @@ -30,6 +42,7 @@ #pragma warning(pop) #endif + #include "SteamWSRequestUGCDetailsCallbackProxy.generated.h" DECLARE_DYNAMIC_MULTICAST_DELEGATE_OneParam(FBlueprintWorkshopDetailsDelegate, const FBPSteamWorkshopItemDetails&, WorkShopDetails); diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp index 1260a3a..f4064ff 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp @@ -9,6 +9,8 @@ #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 @@ -16,7 +18,17 @@ #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 + +#if USING_CODE_ANALYSIS +MSVC_PRAGMA(warning(pop)) +#endif // USING_CODE_ANALYSIS + #include #include #include diff --git a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp index 94706de..cfd1820 100644 --- a/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp +++ b/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp @@ -11,6 +11,9 @@ USteamRequestGroupOfficersCallbackProxy::USteamRequestGroupOfficersCallbackProxy { } +USteamRequestGroupOfficersCallbackProxy::~USteamRequestGroupOfficersCallbackProxy() +{ +} USteamRequestGroupOfficersCallbackProxy* USteamRequestGroupOfficersCallbackProxy::GetSteamGroupOfficerList(UObject* WorldContextObject, FBPUniqueNetId GroupUniqueNetID) { @@ -27,7 +30,7 @@ void USteamRequestGroupOfficersCallbackProxy::Activate() { uint64 id = *((uint64*)GroupUniqueID.UniqueNetId->GetBytes()); SteamAPICall_t hSteamAPICall = SteamFriends()->RequestClanOfficerList(id); - + m_callResultGroupOfficerRequestDetails.Set(hSteamAPICall, this, &USteamRequestGroupOfficersCallbackProxy::OnRequestGroupOfficerDetails); return; }