Skip to content

Commit 9ea1afe

Browse files
committed
Merge branch 'baiki-isActive-kembalikan-bool' into 'master'
self:isActive() returns bool See merge request OpenMW/openmw!4663
2 parents 8966b52 + 087349a commit 9ea1afe

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ message(STATUS "Configuring OpenMW...")
8282
set(OPENMW_VERSION_MAJOR 0)
8383
set(OPENMW_VERSION_MINOR 49)
8484
set(OPENMW_VERSION_RELEASE 0)
85-
set(OPENMW_LUA_API_REVISION 72)
85+
set(OPENMW_LUA_API_REVISION 73)
8686
set(OPENMW_POSTPROCESSING_API_REVISION 2)
8787

8888
set(OPENMW_VERSION_COMMITHASH "")

apps/openmw/mwlua/localscripts.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ namespace MWLua
6464
= [](SelfObject& self) { return "openmw.self[" + self.toString() + "]"; };
6565
selfAPI["object"] = sol::readonly_property([](SelfObject& self) -> LObject { return LObject(self); });
6666
selfAPI["controls"] = sol::readonly_property([](SelfObject& self) { return &self.mControls; });
67-
selfAPI["isActive"] = [](SelfObject& self) { return &self.mIsActive; };
67+
selfAPI["isActive"] = [](SelfObject& self) -> bool { return self.mIsActive; };
6868
selfAPI["enableAI"] = [](SelfObject& self, bool v) { self.mControls.mDisableAI = !v; };
6969
selfAPI["ATTACK_TYPE"]
7070
= LuaUtil::makeStrictReadOnly(LuaUtil::tableFromPairs<std::string_view, MWMechanics::AttackType>(lua,

0 commit comments

Comments
 (0)