From ac9facabf50be0caa867e87f6324e3bd4aaf8d7c Mon Sep 17 00:00:00 2001 From: Petr Mikheev Date: Sat, 5 Aug 2023 12:49:35 +0200 Subject: [PATCH] [Lua] Add alias types.Container.inventory = types.Container.content --- apps/openmw/mwlua/types/container.cpp | 12 +++--------- files/lua_api/openmw/types.lua | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/apps/openmw/mwlua/types/container.cpp b/apps/openmw/mwlua/types/container.cpp index 21ec2f04dc..dd246a73d5 100644 --- a/apps/openmw/mwlua/types/container.cpp +++ b/apps/openmw/mwlua/types/container.cpp @@ -28,15 +28,9 @@ namespace MWLua void addContainerBindings(sol::table container, const Context& context) { - container["content"] = sol::overload( - [](const LObject& o) { - containerPtr(o); - return Inventory{ o }; - }, - [](const GObject& o) { - containerPtr(o); - return Inventory{ o }; - }); + container["content"] = sol::overload([](const LObject& o) { return Inventory{ o }; }, + [](const GObject& o) { return Inventory{ o }; }); + container["inventory"] = container["content"]; container["encumbrance"] = [](const Object& obj) -> float { const MWWorld::Ptr& ptr = containerPtr(obj); return ptr.getClass().getEncumbrance(ptr); diff --git a/files/lua_api/openmw/types.lua b/files/lua_api/openmw/types.lua index 7ba2b5d5bb..542088f484 100644 --- a/files/lua_api/openmw/types.lua +++ b/files/lua_api/openmw/types.lua @@ -1440,7 +1440,9 @@ -- @param #ActivatorRecord activator A Lua table with the fields of a ActivatorRecord. -- @return #ActivatorRecord A strongly typed Activator record. ---- @{#Container} functions + +-------------------------------------------------------------------------------- +-- @{#Container} functions -- @field [parent=#types] #Container Container --- @@ -1455,6 +1457,12 @@ -- @param openmw.core#GameObject object -- @return openmw.core#Inventory +--- +-- Container content (same as `Container.content`, added for consistency with `Actor.inventory`). +-- @function [parent=#Container] inventory +-- @param openmw.core#GameObject object +-- @return openmw.core#Inventory + --- -- Whether the object is a Container. -- @function [parent=#Container] objectIsInstance @@ -1487,7 +1495,9 @@ -- @field #string mwscript MWScript on this container (can be empty) -- @field #number weight capacity of this container ---- @{#Door} functions + +-------------------------------------------------------------------------------- +-- @{#Door} functions -- @field [parent=#types] #Door Door ---