From bc473822f4c90059ed96b7cc2641f7955e445249 Mon Sep 17 00:00:00 2001 From: YermekG Date: Thu, 3 Oct 2024 10:59:17 +1300 Subject: [PATCH 1/2] fix: fixed minor issues --- Source/Immutable/Private/Immutable/ImtblBlui.cpp | 6 +++++- Source/Immutable/Public/Immutable/ImmutableDataTypes.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Immutable/Private/Immutable/ImtblBlui.cpp b/Source/Immutable/Private/Immutable/ImtblBlui.cpp index 7a346ad6..8b085f48 100644 --- a/Source/Immutable/Private/Immutable/ImtblBlui.cpp +++ b/Source/Immutable/Private/Immutable/ImtblBlui.cpp @@ -93,7 +93,11 @@ void UImtblBlui::Init() BluEye->bEnabled = true; IMTBL_LOG("Events subscribed") - BluEye->Init(); + if (!BluEye->Init()) + { + IMTBL_ERR("BluEye is not initialised") + return; + } IMTBL_LOG("BluEye Initialised") // We're attempting to replicate the process that Unreal's WebBrowser diff --git a/Source/Immutable/Public/Immutable/ImmutableDataTypes.h b/Source/Immutable/Public/Immutable/ImmutableDataTypes.h index 46a0b543..768f9c23 100644 --- a/Source/Immutable/Public/Immutable/ImmutableDataTypes.h +++ b/Source/Immutable/Public/Immutable/ImmutableDataTypes.h @@ -100,7 +100,7 @@ struct FImtblUserProfile }; USTRUCT() -struct FImmutablePassportZkEvmRequestAccountsData +struct IMMUTABLE_API FImmutablePassportZkEvmRequestAccountsData { GENERATED_BODY() From 07e486884618631df2c30ffb25958941b3730d22 Mon Sep 17 00:00:00 2001 From: YermekG Date: Mon, 7 Oct 2024 11:18:36 +1300 Subject: [PATCH 2/2] fix: compile issues with header file inclusion --- .../Public/Immutable/Actions/ImtblBlueprintAsyncAction.h | 4 ++-- Source/Immutable/Public/Immutable/ImmutableSubsystem.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Immutable/Public/Immutable/Actions/ImtblBlueprintAsyncAction.h b/Source/Immutable/Public/Immutable/Actions/ImtblBlueprintAsyncAction.h index 03894205..7f8d9190 100644 --- a/Source/Immutable/Public/Immutable/Actions/ImtblBlueprintAsyncAction.h +++ b/Source/Immutable/Public/Immutable/Actions/ImtblBlueprintAsyncAction.h @@ -2,7 +2,7 @@ #pragma once -#include "CoreMinimal.h" +#include "Immutable/ImmutableSubsystem.h" #include "Kismet/BlueprintAsyncActionBase.h" #include "ImtblBlueprintAsyncAction.generated.h" @@ -20,5 +20,5 @@ class IMMUTABLE_API UImtblBlueprintAsyncAction : public UBlueprintAsyncActionBas UObject* WorldContextObject; // Get subsystem - class UImmutableSubsystem* GetSubsystem() const; + UImmutableSubsystem* GetSubsystem() const; }; diff --git a/Source/Immutable/Public/Immutable/ImmutableSubsystem.h b/Source/Immutable/Public/Immutable/ImmutableSubsystem.h index 2a9a32ad..d0d46933 100644 --- a/Source/Immutable/Public/Immutable/ImmutableSubsystem.h +++ b/Source/Immutable/Public/Immutable/ImmutableSubsystem.h @@ -2,7 +2,7 @@ #pragma once -#include "CoreMinimal.h" +#include "ImmutablePassport.h" #include "Subsystems/GameInstanceSubsystem.h" // clang-format off #include "ImmutableSubsystem.generated.h" @@ -22,7 +22,7 @@ class IMMUTABLE_API UImmutableSubsystem : public UGameInstanceSubsystem virtual void Initialize(FSubsystemCollectionBase& Collection) override; virtual void Deinitialize() override; - TWeakObjectPtr GetPassport() const + TWeakObjectPtr GetPassport() const { return MakeWeakObjectPtr(Passport); } @@ -56,7 +56,7 @@ class IMMUTABLE_API UImmutableSubsystem : public UGameInstanceSubsystem class UImtblBlui* ImtblBlui = nullptr; UPROPERTY() - class UImmutablePassport* Passport = nullptr; + UImmutablePassport* Passport = nullptr; bool bHasSetupGameBridge = false; bool bIsReady = false;