Merge branch 'capacity' into 'master'

Lua: Expose capacity for creatures as well

See merge request OpenMW/openmw!4481

apps/openmw/mwlua/types/actor.cpp

@@ -415,6 +415,11 @@ namespace MWLua
             return ptr.getClass().getEncumbrance(ptr);
         };
 
+        actor["getCapacity"] = [](const Object& actor) -> float {
+            const MWWorld::Ptr ptr = actor.ptr();
+            return ptr.getClass().getCapacity(ptr);
+        };
+
         addActorStatsBindings(actor, context);
         addActorMagicBindings(actor, context);
     }

apps/openmw/mwlua/types/npc.cpp

@@ -353,9 +353,5 @@ namespace MWLua
 
             return res;
         };
-        npc["getCapacity"] = [](const Object& actor) -> float {
-            const MWWorld::Ptr ptr = actor.ptr();
-            return ptr.getClass().getCapacity(ptr);
-        };
     }
 }

files/lua_api/openmw/types.lua

@@ -15,6 +15,12 @@
 -- @param openmw.core#GameObject actor
 -- @return #number
 
+---
+-- Get the total weight that the actor can carry.
+-- @function [parent=#Actor] getCapacity
+-- @param openmw.core#GameObject actor
+-- @return #number
+
 ---
 -- Check if the given actor is dead (health reached 0, so death process started).
 -- @function [parent=#Actor] isDead
@@ -1035,12 +1041,6 @@
 -- @param openmw.core#GameObject player The player that you want to modify the disposition for.
 -- @param #number value Base disposition modification value
 
----
--- Get the total weight that the actor can carry.
--- @function [parent=#NPC] getCapacity
--- @param openmw.core#GameObject actor
--- @return #number
-
 --- @{#Classes}: Class Data
 -- @field [parent=#NPC] #Classes classes