mirror of
https://github.com/OpenMW/openmw.git
synced 2025-06-07 09:41:32 +00:00
Merge branch 'kaamatan-seminggu-lagi-8165' into 'master'
Remove redundant activate check in `activateBy` #8165 See merge request OpenMW/openmw!4690
This commit is contained in:
commit
8a10de5fed
2 changed files with 3 additions and 3 deletions
|
@ -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 "")
|
||||
|
|
|
@ -351,7 +351,7 @@ 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);
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue