mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-01 18:11:22 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_6824' into 'master'

Browse source 
Fix #6824

Closes #6824

See merge request OpenMW/openmw!2045
This commit is contained in:
jvoisin 2022-06-21 21:45:28 +00:00
commit f83b661494
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwlua/localscripts.cpp
View file

@ -79,7 +79,7 @@ namespace MWLua
return LObject(getId(target), worldView->getObjectRegistry());
});
aiPackage["sideWithTarget"] = sol::readonly_property([](const AiPackage& p) { return p.sideWithTarget(); });
aiPackage["destination"] = sol::readonly_property([](const AiPackage& p) { return p.getDestination(); });
aiPackage["destPosition"] = sol::readonly_property([](const AiPackage& p) { return p.getDestination(); });
selfAPI["_getActiveAiPackage"] = [](SelfObject& self) -> sol::optional<std::shared_ptr<AiPackage>>
{

2
apps/openmw/mwlua/luabindings.cpp
View file

@ -47,7 +47,7 @@ namespace MWLua
{
auto* lua = context.mLua;
sol::table api(lua->sol(), sol::create);
api["API_REVISION"] = 24;
api["API_REVISION"] = 25;
api["quit"] = [lua]()
{
Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback();

2
files/data/scripts/omw/ai.lua
View file

@ -44,7 +44,7 @@ return {
-- @field #string type Type of the AI package.
-- @field openmw.core#GameObject target Target (usually an actor) of the AI package (can be nil).
-- @field #boolean sideWithTarget Whether to help the target in combat (true or false).
-- @field openmw.util#Vector3 position Destination point of the AI package (can be nil).
-- @field openmw.util#Vector3 destPosition Destination point of the AI package.
--- Return the currently active AI package (or `nil` if there are no AI packages).
-- @function [parent=#AI] getActivePackage