From 28f0bead74346e06825d8b81ddde3fe4ec97a6a4 Mon Sep 17 00:00:00 2001 From: Arnaud Jamin Date: Mon, 6 Jan 2025 21:42:12 -0500 Subject: [PATCH] fix compilation errors on Linux --- .../Source/CogDebug/Public/CogDebugHelper.h | 2 +- .../Private/CogAbilityWindow_Tasks.cpp | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Plugins/Cog/Source/CogDebug/Public/CogDebugHelper.h b/Plugins/Cog/Source/CogDebug/Public/CogDebugHelper.h index 5c1faa4..2d48f29 100644 --- a/Plugins/Cog/Source/CogDebug/Public/CogDebugHelper.h +++ b/Plugins/Cog/Source/CogDebug/Public/CogDebugHelper.h @@ -2,7 +2,7 @@ #include "CoreMinimal.h" #include "Modules/ModuleManager.h" -#include "imgui.h" +#include "UObject/Class.h" class COGDEBUG_API FCogDebugHelper { diff --git a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tasks.cpp b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tasks.cpp index e971eb3..37ccebf 100644 --- a/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tasks.cpp +++ b/Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Tasks.cpp @@ -160,15 +160,15 @@ void FCogAbilityWindow_Tasks::RenderTasksTable(UAbilitySystemComponent& AbilityS continue; } - const char* TaskName = StringCast(*Task->GetName()).Get(); - bool PassFilter = Filter.PassFilter(TaskName); + const auto& TaskName = StringCast(*Task->GetName()); + bool PassFilter = Filter.PassFilter(TaskName.Get()); if (PassFilter == false) { if (const UGameplayAbility* Ability = Cast(Task->GetTaskOwner())) { - const char* AbilityName = StringCast(*FCogAbilityHelper::CleanupName(Ability->GetName())).Get(); - PassFilter = Filter.PassFilter(AbilityName); + const auto& AbilityName = StringCast(*FCogAbilityHelper::CleanupName(Ability->GetName())); + PassFilter = Filter.PassFilter(AbilityName.Get()); } } @@ -228,8 +228,8 @@ void FCogAbilityWindow_Tasks::RenderTasksTable(UAbilitySystemComponent& AbilityS //------------------------ ImGui::TableNextColumn(); - const char* TaskName = StringCast(*Task->GetName()).Get(); - if (ImGui::Selectable(TaskName, SelectedIndex == LineIndex, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowOverlap | ImGuiSelectableFlags_AllowDoubleClick)) + const auto& TaskName = StringCast(*Task->GetName()); + if (ImGui::Selectable(TaskName.Get(), SelectedIndex == LineIndex, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowOverlap | ImGuiSelectableFlags_AllowDoubleClick)) { SelectedIndex = LineIndex; } @@ -287,7 +287,7 @@ void FCogAbilityWindow_Tasks::RenderTaskInfo(const UGameplayTask* Task) ImGui::TableNextColumn(); ImGui::TextColored(TextColor, "Name"); ImGui::TableNextColumn(); - ImGui::Text(StringCast(*Task->GetName()).Get()); + ImGui::Text("%s", StringCast(*Task->GetName()).Get()); //------------------------ // Instance Name @@ -296,7 +296,7 @@ void FCogAbilityWindow_Tasks::RenderTaskInfo(const UGameplayTask* Task) ImGui::TableNextColumn(); ImGui::TextColored(TextColor, "Instance Name"); ImGui::TableNextColumn(); - ImGui::Text(StringCast(*Task->GetInstanceName().ToString()).Get()); + ImGui::Text("%s", StringCast(*Task->GetInstanceName().ToString()).Get()); //------------------------ // Owner @@ -360,7 +360,7 @@ void FCogAbilityWindow_Tasks::RenderTaskInfo(const UGameplayTask* Task) ImGui::TextColored(TextColor, "Debug"); ImGui::TableNextColumn(); ImGui::PushTextWrapPos(FCogWindowWidgets::GetFontWidth() * 80); - ImGui::Text(StringCast(*Task->GetDebugString()).Get()); + ImGui::Text("%s", StringCast(*Task->GetDebugString()).Get()); ImGui::PopTextWrapPos(); ImGui::EndTable(); @@ -383,7 +383,7 @@ void FCogAbilityWindow_Tasks::RenderTaskOwner(const UGameplayTask* Task) OwnerName = GetNameSafe(Object); } - ImGui::Text(StringCast(*OwnerName).Get()); + ImGui::Text("%s", StringCast(*OwnerName).Get()); } //--------------------------------------------------------------------------------------------------------------------------