Skip to content

Commit 8a10de5

Browse files
committed
Merge branch 'kaamatan-seminggu-lagi-8165' into 'master'
Remove redundant activate check in `activateBy` #8165 See merge request OpenMW/openmw!4690
2 parents 42ca8e3 + b7a7936 commit 8a10de5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
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 73)
85+
set(OPENMW_LUA_API_REVISION 74)
8686
set(OPENMW_POSTPROCESSING_API_REVISION 2)
8787

8888
set(OPENMW_VERSION_COMMITHASH "")

apps/openmw/mwlua/objectbindings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,8 @@ namespace MWLua
351351
throw std::runtime_error(
352352
"The argument of `activateBy` must be an actor who activates the object. Got: "
353353
+ actor.toString());
354-
if (objPtr.getRefData().activate())
355-
MWBase::Environment::get().getLuaManager()->objectActivated(objPtr, actorPtr);
354+
355+
MWBase::Environment::get().getLuaManager()->objectActivated(objPtr, actorPtr);
356356
};
357357

358358
auto isEnabled = [](const ObjectT& o) { return o.ptr().getRefData().isEnabled(); };

0 commit comments

Comments
 (0)