mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-30 04:15:31 +00:00
Undo some changes I made in the past that shouldn't exist
This commit is contained in:
parent
1ca921d6e2
commit
79d0ed64d9
4 changed files with 6 additions and 14 deletions
|
@ -262,12 +262,8 @@ namespace MWClass
|
|||
{
|
||||
if(lockLevel!=0)
|
||||
ptr.getCellRef().setLockLevel(abs(lockLevel)); //Changes lock to locklevel, in positive
|
||||
else {
|
||||
if(abs(ptr.getCellRef().getLockLevel())!=0)
|
||||
ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the origional one
|
||||
else
|
||||
ptr.getCellRef().setLockLevel(100); //There never was a locklevel, give it the default biggest one
|
||||
}
|
||||
else
|
||||
ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the origional one
|
||||
}
|
||||
|
||||
void Container::unlock (const MWWorld::Ptr& ptr) const
|
||||
|
|
|
@ -192,12 +192,8 @@ namespace MWClass
|
|||
{
|
||||
if(lockLevel!=0)
|
||||
ptr.getCellRef().setLockLevel(abs(lockLevel)); //Changes lock to locklevel, in positive
|
||||
else {
|
||||
if(abs(ptr.getCellRef().getLockLevel())!=0)
|
||||
ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the origional one
|
||||
else
|
||||
ptr.getCellRef().setLockLevel(100);
|
||||
}
|
||||
else
|
||||
ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the origional one
|
||||
}
|
||||
|
||||
void Door::unlock (const MWWorld::Ptr& ptr) const
|
||||
|
|
|
@ -165,7 +165,7 @@ namespace MWWorld
|
|||
virtual bool hasInventoryStore (const Ptr& ptr) const;
|
||||
///< Does this object have an inventory store, i.e. equipment slots? (default implementation: false)
|
||||
|
||||
virtual void lock (const Ptr& ptr, int lockLevel = 0) const;
|
||||
virtual void lock (const Ptr& ptr, int lockLevel) const;
|
||||
///< Lock object (default implementation: throw an exception)
|
||||
|
||||
virtual void unlock (const Ptr& ptr) const;
|
||||
|
|
|
@ -2526,7 +2526,7 @@ namespace MWWorld
|
|||
store.remove(*it, it->getRefData().getCount(), ptr);
|
||||
}
|
||||
}
|
||||
closestChest.getClass().lock(closestChest);
|
||||
closestChest.getClass().unlock(closestChest);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue