mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-02 04:36:39 +00:00
Code Issues Releases Wiki Activity

Merge branch 'youonlyneedtounlockonce' into 'master'

Browse source 
Don't unlock unlocked objects now that unlock is no longer idempotent

See merge request OpenMW/openmw!3125
This commit is contained in:
psi29a 2023-06-11 17:41:23 +00:00
commit 1d5b73f20a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmechanics/spelleffects.cpp
View file

@ -954,8 +954,8 @@ namespace MWMechanics
if (caster == getPlayer()) if (caster == getPlayer())
MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicOpenSuccess}"); MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicOpenSuccess}");
target.getCellRef().unlock();
} }
target.getCellRef().unlock();
} }
else else
{ {

4
apps/openmw/mwscript/miscextensions.cpp
View file

@ -366,8 +366,8 @@ namespace MWScript
void execute(Interpreter::Runtime& runtime) override void execute(Interpreter::Runtime& runtime) override
{ {
MWWorld::Ptr ptr = R()(runtime); MWWorld::Ptr ptr = R()(runtime);
if (ptr.getCellRef().isLocked())
ptr.getCellRef().unlock(); ptr.getCellRef().unlock();
} }
}; };