mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-26 06:40:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fixed an issue #6101 (https://gitlab.com/OpenMW/openmw/-/issues/6101)

See merge request OpenMW/openmw!949
This commit is contained in:
psi29a 2021-06-22 14:51:49 +00:00
commit ff0fd2f684
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.md
View File

@ -27,6 +27,7 @@ Programmers
Alexander Olofsson (Ananace) Alexander Olofsson (Ananace)
Alex Rice Alex Rice
Alex S (docwest) Alex S (docwest)
Alexey Yaryshev (skeevert)
Allofich Allofich
Andrei Kortunov (akortunov) Andrei Kortunov (akortunov)
AnyOldName3 AnyOldName3

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@
Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions) Bug #3737: Scripts from The Underground 2 .esp do not play (all patched versions)
Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes Bug #3846: Strings starting with "-" fail to compile if not enclosed in quotes
Bug #5483: AutoCalc flag is not used to calculate spells cost Bug #5483: AutoCalc flag is not used to calculate spells cost
Bug #6101: Disarming trapped unlocked owned objects isn't considered a crime
0.47.0 0.47.0
------ ------

2
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View File

@ -869,7 +869,7 @@ namespace MWMechanics
int lockLevel = cellref.getLockLevel(); int lockLevel = cellref.getLockLevel();
if (target.getClass().isDoor() && if (target.getClass().isDoor() &&
(lockLevel <= 0 || lockLevel == ESM::UnbreakableLock) && (lockLevel <= 0 || lockLevel == ESM::UnbreakableLock) &&
ptr.getCellRef().getTrap().empty()) cellref.getTrap().empty())
{ {
return true; return true;
} }