mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-12 22:14:42 +00:00
Fix #5155
This commit is contained in:
parent
2e05e0e829
commit
56b6a7ada4
@ -138,6 +138,7 @@
|
||||
Bug #5134: Doors rotation by "Lock" console command is inconsistent
|
||||
Bug #5137: Textures with Clamp Mode set to Clamp instead of Wrap are too dark outside the boundaries
|
||||
Bug #5149: Failing lock pick attempts isn't always a crime
|
||||
Bug #5155: Shouldn't be able to magically lock organic containers
|
||||
Feature #1774: Handle AvoidNode
|
||||
Feature #2229: Improve pathfinding AI
|
||||
Feature #3025: Analogue gamepad movement controls
|
||||
|
@ -321,7 +321,8 @@ namespace MWClass
|
||||
|
||||
bool Container::canLock(const MWWorld::ConstPtr &ptr) const
|
||||
{
|
||||
return true;
|
||||
const MWWorld::LiveCellRef<ESM::Container> *ref = ptr.get<ESM::Container>();
|
||||
return !(ref->mBase->mFlags & ESM::Container::Organic);
|
||||
}
|
||||
|
||||
MWWorld::Ptr Container::copyToCellImpl(const MWWorld::ConstPtr &ptr, MWWorld::CellStore &cell) const
|
||||
|
@ -29,8 +29,7 @@ namespace MWMechanics
|
||||
std::string& resultMessage, std::string& resultSound)
|
||||
{
|
||||
if (lock.getCellRef().getLockLevel() <= 0 ||
|
||||
lock.getCellRef().getLockLevel() == ESM::UnbreakableLock ||
|
||||
!lock.getClass().canLock(lock)) //If it's unlocked or can not be unlocked back out immediately
|
||||
lock.getCellRef().getLockLevel() == ESM::UnbreakableLock) //If it's unlocked or can not be unlocked back out immediately
|
||||
return;
|
||||
|
||||
int lockStrength = lock.getCellRef().getLockLevel();
|
||||
|
Loading…
x
Reference in New Issue
Block a user