From 539a4ba9e8a0f43fb6af2bca9ce0368c83f16632 Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Wed, 14 May 2025 15:21:44 -0400 Subject: [PATCH] Cheat command fallback to PIE 1 actor selection --- Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp | 10 +++++++++- Plugins/Cog/Source/CogDebug/Public/CogDebug.h | 2 +- .../CogEngine/Private/CogEngineWindow_Cheats.cpp | 3 ++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp b/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp index 9214cd4..b03424e 100644 --- a/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp +++ b/Plugins/Cog/Source/CogDebug/Private/CogDebug.cpp @@ -15,8 +15,16 @@ FCogDebugSettings FCogDebug::Settings = FCogDebugSettings(); //-------------------------------------------------------------------------------------------------------------------------- FCogDebugContext& FCogDebug::Get(const int32 InPieId) { + if (InPieId == INDEX_NONE) + { + if (FCogDebugContext* Context = DebugContexts.Find(1)) + { + return *Context; + } + } + FCogDebugContext& Context = DebugContexts.FindOrAdd(InPieId); - return Context; + return Context; } //-------------------------------------------------------------------------------------------------------------------------- diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebug.h b/Plugins/Cog/Source/CogDebug/Public/CogDebug.h index a436fd0..613d474 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebug.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebug.h @@ -72,7 +72,7 @@ struct COGDEBUG_API FCogDebug static void GetDebugDrawSweepSettings(FCogDebugDrawSweepParams& Params); static FCogDebugContext& Get(int32 InPieId); - + static FCogDebugContext& Get(); static int32 GetPieSessionId(); diff --git a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp index ca1ae50..0398cae 100644 --- a/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp +++ b/Plugins/Cog/Source/CogEngine/Private/CogEngineWindow_Cheats.cpp @@ -62,7 +62,8 @@ void FCogEngineWindow_Cheats::Initialize() const bool ApplyToAllies = InArgs.Contains("-Allies"); const bool ApplyToControlled = InArgs.Contains("-Controlled"); - RequestCheat(*Replicator, GetLocalPlayerPawn(), GetSelection(), *Cheat, ApplyToEnemies, ApplyToAllies, ApplyToControlled); + AActor* Selection = GetSelection(); + RequestCheat(*Replicator, GetLocalPlayerPawn(), Selection, *Cheat, ApplyToEnemies, ApplyToAllies, ApplyToControlled); } }));