mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 19:20:49 +00:00
Merge branch 'youonlyneedtounlockonce' into 'master'
Don't unlock unlocked objects now that unlock is no longer idempotent See merge request OpenMW/openmw!3125
This commit is contained in:
commit
1d5b73f20a
@ -954,8 +954,8 @@ namespace MWMechanics
|
||||
|
||||
if (caster == getPlayer())
|
||||
MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicOpenSuccess}");
|
||||
target.getCellRef().unlock();
|
||||
}
|
||||
target.getCellRef().unlock();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -366,8 +366,8 @@ namespace MWScript
|
||||
void execute(Interpreter::Runtime& runtime) override
|
||||
{
|
||||
MWWorld::Ptr ptr = R()(runtime);
|
||||
|
||||
ptr.getCellRef().unlock();
|
||||
if (ptr.getCellRef().isLocked())
|
||||
ptr.getCellRef().unlock();
|
||||
}
|
||||
};
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user