Skip to content

Commit af22123

Browse files
UE4SSUE4SS
committed
fix: Unwanted FName constructor usage with implicit FNAME_Add
1 parent ad867f0 commit af22123

File tree

5 files changed

+55
-55
lines changed

5 files changed

+55
-55
lines changed

‎UE4SS/include/LuaType/LuaUObject.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ namespace RC::LuaType
584584
{
585585
obj_as_struct = reflected_object->GetClassPrivate();
586586
}
587-
auto* property = obj_as_struct->FindProperty(Unreal::FName(property_name));
587+
auto* property = obj_as_struct->FindProperty(Unreal::FName(property_name, Unreal::FNAME_Find));
588588

589589
construct_xproperty(lua, property);
590590
return 1;
@@ -773,7 +773,7 @@ No overload found for function 'UObject.ProcessConsoleExec'.
773773
return;
774774
}
775775

776-
Unreal::FName property_name = Unreal::FName(member_name);
776+
Unreal::FName property_name = Unreal::FName(member_name, Unreal::FNAME_Find);
777777
Unreal::FField* field = LuaCustomProperty::StaticStorage::property_list.find_or_nullptr(lua_object.get_remote_cpp_object(), member_name);
778778

779779
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
@@ -142,7 +142,7 @@ namespace RC
142142

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

148148
// Attempt at dynamically fetching the params
@@ -300,7 +300,7 @@ namespace RC
300300
lua_data.lua.registry().get_function_ref(lua_data.lua_post_callback_ref);
301301

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

306306
// Attempt at dynamically fetching the params
@@ -4257,7 +4257,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
42574257

42584258
lua.registry().get_function_ref(registry_index.lua_index);
42594259

4260-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4260+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
42614261
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
42624262

42634263
auto node = Stack.Node();
@@ -4384,7 +4384,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
43844384
const auto& lua = *lua_ptr;
43854385

43864386
lua.registry().get_function_ref(registry_index.lua_index);
4387-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4387+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
43884388
LuaType::RemoteUnrealParam::construct(lua, &Engine, s_object_property_name);
43894389
LuaType::RemoteUnrealParam::construct(lua, &WorldContext.GetThisCurrentWorld(), s_object_property_name);
43904390
LuaType::FURL::construct(lua, URL);
@@ -4427,7 +4427,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
44274427
const auto& lua = *lua_ptr;
44284428

44294429
lua.registry().get_function_ref(registry_index.lua_index);
4430-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4430+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
44314431
LuaType::RemoteUnrealParam::construct(lua, &Engine, s_object_property_name);
44324432
LuaType::RemoteUnrealParam::construct(lua, &WorldContext.GetThisCurrentWorld(), s_object_property_name);
44334433
LuaType::FURL::construct(lua, URL);
@@ -4468,7 +4468,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
44684468
const auto& lua = *lua_ptr;
44694469

44704470
lua.registry().get_function_ref(registry_index.lua_index);
4471-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4471+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
44724472
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
44734473
lua.call_function(1, 0);
44744474
}
@@ -4489,7 +4489,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
44894489
const auto& lua = *lua_ptr;
44904490

44914491
lua.registry().get_function_ref(registry_index.lua_index);
4492-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4492+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
44934493
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
44944494
lua.call_function(1, 0);
44954495
}
@@ -4510,7 +4510,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
45104510
const auto& lua = *lua_ptr;
45114511

45124512
lua.registry().get_function_ref(registry_index.lua_index);
4513-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4513+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
45144514
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
45154515
lua.call_function(1, 0);
45164516
}
@@ -4531,7 +4531,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
45314531
const auto& lua = *lua_ptr;
45324532

45334533
lua.registry().get_function_ref(registry_index.lua_index);
4534-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4534+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
45354535
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
45364536
lua.call_function(1, 0);
45374537
}
@@ -4552,9 +4552,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
45524552
const auto& lua = *lua_ptr;
45534553

45544554
lua.registry().get_function_ref(registry_index.lua_index);
4555-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4555+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
45564556
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
4557-
static auto s_int_property_name = Unreal::FName(STR("IntProperty"));
4557+
static auto s_int_property_name = Unreal::FName(STR("IntProperty"), Unreal::FNAME_Find);
45584558
LuaType::RemoteUnrealParam::construct(lua, &EndPlayReason, s_int_property_name);
45594559
lua.call_function(2, 0);
45604560
}
@@ -4575,9 +4575,9 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
45754575
const auto& lua = *lua_ptr;
45764576

45774577
lua.registry().get_function_ref(registry_index.lua_index);
4578-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4578+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
45794579
LuaType::RemoteUnrealParam::construct(lua, &Context, s_object_property_name);
4580-
static auto s_int_property_name = Unreal::FName(STR("IntProperty"));
4580+
static auto s_int_property_name = Unreal::FName(STR("IntProperty"), Unreal::FNAME_Find);
45814581
LuaType::RemoteUnrealParam::construct(lua, &EndPlayReason, s_int_property_name);
45824582
lua.call_function(2, 0);
45834583
}
@@ -4632,7 +4632,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
46324632
{
46334633
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
46344634

4635-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4635+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
46364636
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
46374637
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &in_world, s_object_property_name);
46384638
callback_data.lua->set_string(to_string(cmd));
@@ -4692,7 +4692,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
46924692
{
46934693
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
46944694

4695-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4695+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
46964696
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
46974697
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &in_world, s_object_property_name);
46984698
callback_data.lua->set_string(to_string(cmd));
@@ -4753,7 +4753,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
47534753
{
47544754
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
47554755

4756-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4756+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
47574757
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
47584758
callback_data.lua->set_string(to_string(str));
47594759
LuaType::FOutputDevice::construct(*callback_data.lua, &ar);
@@ -4801,7 +4801,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
48014801
{
48024802
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
48034803

4804-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4804+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
48054805
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
48064806
callback_data.lua->set_string(to_string(str));
48074807
LuaType::FOutputDevice::construct(*callback_data.lua, &ar);
@@ -4932,7 +4932,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
49324932
{
49334933
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
49344934

4935-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4935+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
49364936
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
49374937
callback_data.lua->set_string(to_string(command));
49384938
auto params_table = callback_data.lua->prepare_new_table();
@@ -4988,7 +4988,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'.
49884988
{
49894989
callback_data.lua->registry().get_function_ref(registry_index.lua_index);
49904990

4991-
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"));
4991+
static auto s_object_property_name = Unreal::FName(STR("ObjectProperty"), Unreal::FNAME_Find);
49924992
LuaType::RemoteUnrealParam::construct(*callback_data.lua, &context, s_object_property_name);
49934993
callback_data.lua->set_string(to_string(command));
49944994
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)