ed/Cog
1
0
Fork 0
mirror of https://github.com/Ed94/Cog.git synced 2026-08-06 15:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compling errors on various platforms/consoles

Browse Source 
- Fixed some include paths case sensitive
- Fixed CogImguiInputHelper.h including itself
- Added missing includes
- Added missing forward declarations
- Fixed enums forward declarations
- Fixed "TCHAR_TO_ANSI" and const char* formatting issues
- Fixed "sscanf" on Linux
This commit is contained in:
Elhoussine Mehnik
2023-12-09 04:38:02 +01:00
parent caa0f015d4
commit 3e73c486a4
62 changed files with 194 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityReplicator.cpp
+2
View File
@@ -9,6 +9,8 @@
#include "GameplayEffect.h"
#include "Net/Core/PushModel/PushModel.h"
#include "Net/UnrealNetwork.h"
#include "GameFramework/PlayerController.h"
#include "Engine/World.h"
//--------------------------------------------------------------------------------------------------------------------------
ACogAbilityReplicator* ACogAbilityReplicator::Spawn(APlayerController* Controller)
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp
+5 -5
View File
@@ -212,11 +212,11 @@ void FCogAbilityWindow_Abilities::RenderAbilitiesTable(UAbilitySystemComponent&
continue;
}
const char* AbilityName = TCHAR_TO_ANSI(*GetAbilityName(Ability));
if (Filter.PassFilter(AbilityName) == false)
{
continue;
}
const auto AbilityName = StringCast<ANSICHAR>(*GetAbilityName(Ability));
if (Filter.PassFilter(AbilityName.Get()) == false)
{
continue;
}
FitleredAbilities.Add(Spec);
}
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Attributes.cpp
+3 -3
View File
@@ -207,9 +207,9 @@ void FCogAbilityWindow_Attributes::RenderContent()
continue;
}
const char* AttributeName = TCHAR_TO_ANSI(*Attribute.GetName());
const auto AttributeName = StringCast<ANSICHAR>(*Attribute.GetName());
if (Filter.PassFilter(AttributeName) == false)
if (Filter.PassFilter(AttributeName.Get()) == false)
{
continue;
}
@@ -233,7 +233,7 @@ void FCogAbilityWindow_Attributes::RenderContent()
ImGui::TableNextColumn();
ImGui::Text("");
ImGui::SameLine();
if (ImGui::Selectable(AttributeName, Selected == Index, ImGuiSelectableFlags_SpanAllColumns))
if (ImGui::Selectable(AttributeName.Get(), Selected == Index, ImGuiSelectableFlags_SpanAllColumns))
{
Selected = Index;
}
Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp
+3 -3
View File
@@ -187,8 +187,8 @@ void FCogAbilityWindow_Effects::RenderEffectRow(const UAbilitySystemComponent& A
const FActiveGameplayEffect& ActiveEffect = *ActiveEffectPtr;
const UGameplayEffect& Effect = *EffectPtr;
const char* EffectName = TCHAR_TO_ANSI(*GetEffectName(Effect));
if (Filter.PassFilter(EffectName) == false)
const auto EffectName = StringCast<ANSICHAR>(*GetEffectName(Effect));
if (Filter.PassFilter(EffectName.Get()) == false)
{
return;
}
@@ -203,7 +203,7 @@ void FCogAbilityWindow_Effects::RenderEffectRow(const UAbilitySystemComponent& A
ImGui::PushStyleColor(ImGuiCol_Text, FCogImguiHelper::ToImVec4(AlignmentConfig->GetEffectColor(Asset, Effect)));
if (ImGui::Selectable(EffectName, Selected == Index, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowOverlap | ImGuiSelectableFlags_AllowDoubleClick))
if (ImGui::Selectable(EffectName.Get(), Selected == Index, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowOverlap | ImGuiSelectableFlags_AllowDoubleClick))
{
Selected = Index;
}
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityConfig_Alignment.h
+1 -1
View File
@@ -7,7 +7,7 @@
class UAbilitySystemComponent;
class UCogAbilityDataAsset;
class UGameplayEffect;
namespace EGameplayModOp { enum Type; };
namespace EGameplayModOp { enum Type : int; };
struct FGameplayAttribute;
struct FGameplayModifierInfo;
struct FModifierSpec;
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityHelper.h
+1 -1
View File
@@ -6,7 +6,7 @@
class UCogAbilityDataAsset;
class UGameplayEffect;
namespace EGameplayModOp { enum Type; }
namespace EGameplayModOp { enum Type : int; }
struct FGameplayTagContainer;
class COGABILITY_API FCogAbilityHelper
Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Effects.h
+1 -1
View File
@@ -13,7 +13,7 @@ class UCogAbilityConfig_Alignment;
class UCogAbilityConfig_Effects;
class UCogAbilityDataAsset;
class UGameplayEffect;
namespace EGameplayModOp { enum Type; };
namespace EGameplayModOp { enum Type : int; };
struct FActiveGameplayEffect;
struct FGameplayModifierInfo;
struct FModifierSpec;