Skip to content

Commit a058bda

Browse files
narknonnarknon
authored
Merge pull request #1057 from UE4SS-RE/fname-fix
fix: Unwanted FName constructor usage with implicit FNAME_Add
2 parents 33d676b + d3beb2e commit a058bda

File tree

5 files changed

+59
-61
lines changed

5 files changed

+59
-61
lines changed

‎UE4SS/include/LuaType/LuaUObject.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ namespace RC::LuaType
589589
{
590590
obj_as_struct = reflected_object->GetClassPrivate();
591591
}
592-
auto* property = obj_as_struct->FindProperty(Unreal::FName(property_name));
592+
auto* property = obj_as_struct->FindProperty(Unreal::FName(property_name, Unreal::FNAME_Find));
593593

594594
construct_xproperty(lua, property);
595595
return 1;
@@ -778,7 +778,7 @@ No overload found for function 'UObject.ProcessConsoleExec'.
778778
return;
779779
}
780780

781-
Unreal::FName property_name = Unreal::FName(member_name);
781+
Unreal::FName property_name = Unreal::FName(member_name, Unreal::FNAME_Find);
782782
Unreal::FField* field = LuaCustomProperty::StaticStorage::property_list.find_or_nullptr(lua_object.get_remote_cpp_object(), member_name);
783783

784784
if (!field)

‎UE4SS/src/LuaType/LuaUScriptStruct.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ namespace RC::LuaType
201201
{
202202
auto& lua_object = lua.get_userdata<UScriptStruct>();
203203

204-
Unreal::FName property_name = Unreal::FName(ensure_str(lua.get_string()));
204+
Unreal::FName property_name = Unreal::FName(ensure_str(lua.get_string()), Unreal::FNAME_Find);
205205

206206
// Check if property_name is 'NONE'
207207
if (property_name.GetComparisonIndex() == 0)

‎UE4SS/src/Mod/LuaMod.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ namespace RC
146146

147147
// Set up the first param (context / this-ptr)
148148
// TODO: Check what happens if a static UFunction is hooked since they don't have any context
149-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
149+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
150150
LuaType::RemoteUnrealParam::construct(lua_data.lua, &context.Context, s_object_property_name);
151151

152152
// Attempt at dynamically fetching the params
@@ -304,7 +304,7 @@ namespace RC
304304
lua_data.lua.registry().get_function_ref(lua_data.lua_post_callback_ref);
305305

306306
// Set up the first param (context / this-ptr)
307-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
307+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
308308
LuaType::RemoteUnrealParam::construct(lua_data.lua, &context.Context, s_object_property_name);
309309

310310
// Attempt at dynamically fetching the params
@@ -4330,7 +4330,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
43304330

43314331
lua.registry().get_function_ref(registry_index.lua_index);
43324332

4333-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4333+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
43344334
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
43354335

43364336
auto node = Stack.Node();
@@ -4457,7 +4457,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
44574457
const auto& lua = *lua_ptr;
44584458

44594459
lua.registry().get_function_ref(registry_index.lua_index);
4460-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4460+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
44614461
LuaType::RemoteUnrealParam::construct(lua, &Engine, s_object_property_name);
44624462
LuaType::RemoteUnrealParam::construct(lua, &WorldContext.GetThisCurrentWorld(), s_object_property_name);
44634463
LuaType::FURL::construct(lua, URL);
@@ -4500,7 +4500,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
45004500
const auto& lua = *lua_ptr;
45014501

45024502
lua.registry().get_function_ref(registry_index.lua_index);
4503-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4503+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
45044504
LuaType::RemoteUnrealParam::construct(lua, &Engine, s_object_property_name);
45054505
LuaType::RemoteUnrealParam::construct(lua, &WorldContext.GetThisCurrentWorld(), s_object_property_name);
45064506
LuaType::FURL::construct(lua, URL);
@@ -4541,7 +4541,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
45414541
const auto& lua = *lua_ptr;
45424542

45434543
lua.registry().get_function_ref(registry_index.lua_index);
4544-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4544+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
45454545
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
45464546
lua.call_function(1, 0);
45474547
}
@@ -4562,7 +4562,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
45624562
const auto& lua = *lua_ptr;
45634563

45644564
lua.registry().get_function_ref(registry_index.lua_index);
4565-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4565+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
45664566
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
45674567
lua.call_function(1, 0);
45684568
}
@@ -4583,7 +4583,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
45834583
const auto& lua = *lua_ptr;
45844584

45854585
lua.registry().get_function_ref(registry_index.lua_index);
4586-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4586+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
45874587
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
45884588
lua.call_function(1, 0);
45894589
}
@@ -4604,7 +4604,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
46044604
const auto& lua = *lua_ptr;
46054605

46064606
lua.registry().get_function_ref(registry_index.lua_index);
4607-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4607+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
46084608
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
46094609
lua.call_function(1, 0);
46104610
}
@@ -4625,9 +4625,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
46254625
const auto& lua = *lua_ptr;
46264626

46274627
lua.registry().get_function_ref(registry_index.lua_index);
4628-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4628+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
46294629
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
4630-
static auto s_int_property_name = Unreal::FName(STR("IntProperty"));
4630+
static auto s_int_property_name = Unreal::FName(STR("IntProperty"), Unreal::FNAME_Find);
46314631
LuaType::RemoteUnrealParam::construct(lua, &EndPlayReason, s_int_property_name);
46324632
lua.call_function(2, 0);
46334633
}
@@ -4648,9 +4648,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
46484648
const auto& lua = *lua_ptr;
46494649

46504650
lua.registry().get_function_ref(registry_index.lua_index);
4651-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4651+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
46524652
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
4653-
static auto s_int_property_name = Unreal::FName(STR("IntProperty"));
4653+
static auto s_int_property_name = Unreal::FName(STR("IntProperty"), Unreal::FNAME_Find);
46544654
LuaType::RemoteUnrealParam::construct(lua, &EndPlayReason, s_int_property_name);
46554655
lua.call_function(2, 0);
46564656
}
@@ -4705,7 +4705,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
47054705
{
47064706
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
47074707

4708-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4708+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
47094709
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
47104710
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &in_world, s_object_property_name);
47114711
callback_data.lua->set_string(to_string(cmd));
@@ -4765,7 +4765,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
47654765
{
47664766
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
47674767

4768-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4768+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
47694769
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
47704770
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &in_world, s_object_property_name);
47714771
callback_data.lua->set_string(to_string(cmd));
@@ -4826,7 +4826,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
48264826
{
48274827
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
48284828

4829-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4829+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
48304830
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
48314831
callback_data.lua->set_string(to_string(str));
48324832
LuaType::FOutputDevice::construct(*callback_data.lua, &ar);
@@ -4874,7 +4874,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
48744874
{
48754875
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
48764876

4877-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4877+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
48784878
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
48794879
callback_data.lua->set_string(to_string(str));
48804880
LuaType::FOutputDevice::construct(*callback_data.lua, &ar);
@@ -5005,7 +5005,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
50055005
{
50065006
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
50075007

5008-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
5008+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
50095009
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
50105010
callback_data.lua->set_string(to_string(command));
50115011
auto params_table = callback_data.lua->prepare_new_table();
@@ -5061,7 +5061,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
50615061
{
50625062
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
50635063

5064-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
5064+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
50655065
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
50665066
callback_data.lua->set_string(to_string(command));
50675067
auto params_table = callback_data.lua->prepare_new_table();

‎UE4SS/src/SDKGenerator/JSONDumper.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ namespace RC::UEGenerator::JSONDumper
7575

7676
auto static should_skip_property(FProperty* property) -> bool
7777
{
78-
static FName uber_graph_frame_name = FName(STR("UberGraphFrame"));
79-
static FName default_scene_root_name = FName(STR("DefaultSceneRoot"));
78+
static FName uber_graph_frame_name = FName(STR("UberGraphFrame"), FNAME_Find);
79+
static FName default_scene_root_name = FName(STR("DefaultSceneRoot"), FNAME_Find);
8080

8181
if (property->HasAnyPropertyFlags(Unreal::EPropertyFlags::CPF_ReturnParm))
8282
{
@@ -104,12 +104,12 @@ namespace RC::UEGenerator::JSONDumper
104104

105105
auto static should_skip_general_function(UFunction* function) -> bool
106106
{
107-
static FName receive_name = FName(STR("Receive"));
108-
static FName receive_typo_name = FName(STR("Recieve"));
109-
static FName receive_begin_play_name = FName(STR("ReceiveBeginPlay"));
110-
static FName receive_destroyed_name = FName(STR("ReceiveDestroyedPlay"));
111-
static FName receive_tick_name = FName(STR("ReceiveTick"));
112-
static FName user_construction_script_name = FName(STR("UserConstructionScript"));
107+
static FName receive_name = FName(STR("Receive"), FNAME_Find);
108+
static FName receive_typo_name = FName(STR("Recieve"), FNAME_Find);
109+
static FName receive_begin_play_name = FName(STR("ReceiveBeginPlay"), FNAME_Find);
110+
static FName receive_destroyed_name = FName(STR("ReceiveDestroyedPlay"), FNAME_Find);
111+
static FName receive_tick_name = FName(STR("ReceiveTick"), FNAME_Find);
112+
static FName user_construction_script_name = FName(STR("UserConstructionScript"), FNAME_Find);
113113

114114
FName function_fname = function->GetNamePrivate();
115115
if (function_fname.Equals(receive_name))

0 commit comments

Comments
 (0)