Merge branch 'kaamatan-seminggu-lagi-8165' into 'master'

Remove redundant activate check in `activateBy` #8165

See merge request OpenMW/openmw!4690

Author: psi29a

CMakeLists.txt

@@ -82,7 +82,7 @@ message(STATUS "Configuring OpenMW...")
 set(OPENMW_VERSION_MAJOR 0)
 set(OPENMW_VERSION_MINOR 49)
 set(OPENMW_VERSION_RELEASE 0)
-set(OPENMW_LUA_API_REVISION 73)
+set(OPENMW_LUA_API_REVISION 74)
 set(OPENMW_POSTPROCESSING_API_REVISION 2)
 
 set(OPENMW_VERSION_COMMITHASH "")

apps/openmw/mwlua/objectbindings.cpp

@@ -351,8 +351,8 @@ namespace MWLua
                     throw std::runtime_error(
                         "The argument of `activateBy` must be an actor who activates the object. Got: "
                         + actor.toString());
-                if (objPtr.getRefData().activate())
-                    MWBase::Environment::get().getLuaManager()->objectActivated(objPtr, actorPtr);
+
+                MWBase::Environment::get().getLuaManager()->objectActivated(objPtr, actorPtr);
             };
 
             auto isEnabled = [](const ObjectT& o) { return o.ptr().getRefData().isEnabled(); };