Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions UE4SS/include/LuaType/LuaUClass.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ namespace RC::LuaType
};
class UClass : public UObjectBase<Unreal::UClass, UClassName>
{
public:
using Super = LuaType::UStruct;

private:
explicit UClass(Unreal::UClass* object);

Expand Down
1 change: 1 addition & 0 deletions UE4SS/include/LuaType/LuaUFunction.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <LuaMadeSimple/LuaMadeSimple.hpp>
#include <LuaType/LuaUObject.hpp>
#include <LuaType/LuaUStruct.hpp>

namespace RC::Unreal
{
Expand Down
6 changes: 2 additions & 4 deletions UE4SS/src/LuaType/LuaUClass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace RC::LuaType
if (lua.is_nil(-1))
{
lua.discard_value(-1);
LuaType::UObject::construct(lua, lua_object);
LuaType::UStruct::construct(lua, lua_object);
setup_metamethods(lua_object);
setup_member_functions<LuaMadeSimple::Type::IsFinal::Yes>(table);
lua.new_metatable<LuaType::UClass>(metatable_name, lua_object.get_metamethods());
Expand All @@ -35,7 +35,7 @@ namespace RC::LuaType

auto UClass::construct(const LuaMadeSimple::Lua& lua, BaseObject& construct_to) -> const LuaMadeSimple::Lua::Table
{
LuaMadeSimple::Lua::Table table = UObject::construct(lua, construct_to);
LuaMadeSimple::Lua::Table table = UStruct::construct(lua, construct_to);

setup_member_functions<LuaMadeSimple::Type::IsFinal::No>(table);

Expand All @@ -52,8 +52,6 @@ namespace RC::LuaType
template <LuaMadeSimple::Type::IsFinal is_final>
auto UClass::setup_member_functions(const LuaMadeSimple::Lua::Table& table) -> void
{
Super::setup_member_functions<LuaMadeSimple::Type::IsFinal::No>(table);

// CDO = ClassDefaultObject
table.add_pair("GetCDO", [](const LuaMadeSimple::Lua& lua) -> int {
const auto& lua_object = lua.get_userdata<UClass>();
Expand Down
4 changes: 2 additions & 2 deletions UE4SS/src/LuaType/LuaUFunction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace RC::LuaType
if (lua.is_nil(-1))
{
lua.discard_value(-1);
LuaType::UObject::construct(lua, lua_object);
LuaType::UStruct::construct(lua, lua_object);
setup_metamethods(lua_object);
setup_member_functions<LuaMadeSimple::Type::IsFinal::Yes>(table);
lua.new_metatable<LuaType::UFunction>(metatable_name, lua_object.get_metamethods());
Expand All @@ -56,7 +56,7 @@ namespace RC::LuaType

auto UFunction::construct(const LuaMadeSimple::Lua& lua, BaseObject& construct_to) -> const LuaMadeSimple::Lua::Table
{
LuaMadeSimple::Lua::Table table = UObject::construct(lua, construct_to);
LuaMadeSimple::Lua::Table table = UStruct::construct(lua, construct_to);

setup_member_functions<LuaMadeSimple::Type::IsFinal::No>(table);

Expand Down
3 changes: 3 additions & 0 deletions assets/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,9 @@ Types with `get` or `Get` functions now have both variants. ([UE4SS #877](https:

Improved error messages when improperly indexing into `LocalUnrealParam`, and `RemoteUnrealParam` without first calling `Get`. ([UE4SS #1154](https://github.com/UE4SS-RE/RE-UE4SS/pull/1154))

Fixed UFunction and UClass properly inheriting from UStruct in Lua. ([UE4SS #1154](https://github.com/UE4SS-RE/RE-UE4SS/pull/1158))
Corporalwill123

#### UEHelpers [UE4SS #650](https://github.com/UE4SS-RE/RE-UE4SS/pull/650)
- Increased version to 3

Expand Down
2 changes: 1 addition & 1 deletion docs/lua-api/classes/ufunction.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# UFunction

## Inheritance
[UObject](./uobject.md)
[UStruct](./ustruct.md)

## Metamethods

Expand Down