mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-09 00:41:32 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
Remove redundant activate check in `activateBy` #8165

See merge request OpenMW/openmw!4690
This commit is contained in:
psi29a 2025-05-24 12:35:09 +00:00
commit 8a10de5fed
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -82,7 +82,7 @@ message(STATUS "Configuring OpenMW...")
set(OPENMW_VERSION_MAJOR 0) set(OPENMW_VERSION_MAJOR 0)
set(OPENMW_VERSION_MINOR 49) set(OPENMW_VERSION_MINOR 49)
set(OPENMW_VERSION_RELEASE 0) 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_POSTPROCESSING_API_REVISION 2)
set(OPENMW_VERSION_COMMITHASH "") set(OPENMW_VERSION_COMMITHASH "")

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

@ -351,7 +351,7 @@ namespace MWLua
throw std::runtime_error( throw std::runtime_error(
"The argument of `activateBy` must be an actor who activates the object. Got: " "The argument of `activateBy` must be an actor who activates the object. Got: "
+ actor.toString()); + actor.toString());
if (objPtr.getRefData().activate())
MWBase::Environment::get().getLuaManager()->objectActivated(objPtr, actorPtr); MWBase::Environment::get().getLuaManager()->objectActivated(objPtr, actorPtr);
}; };