mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-21 03:44:05 +00:00
Code Issues Releases Wiki Activity

Undo some changes I made in the past that shouldn't exist

Browse source
This commit is contained in:
Digmaster 2014-05-26 23:31:40 -04:00
parent 1ca921d6e2
commit 79d0ed64d9
4 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwclass/container.cpp
View file

@ -262,12 +262,8 @@ namespace MWClass
{ {
if(lockLevel!=0) if(lockLevel!=0)
ptr.getCellRef().setLockLevel(abs(lockLevel)); //Changes lock to locklevel, in positive 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 else
ptr.getCellRef().setLockLevel(100); //There never was a locklevel, give it the default biggest one ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the origional one
}
} }
void Container::unlock (const MWWorld::Ptr& ptr) const void Container::unlock (const MWWorld::Ptr& ptr) const

6
apps/openmw/mwclass/door.cpp
View file

@ -192,12 +192,8 @@ namespace MWClass
{ {
if(lockLevel!=0) if(lockLevel!=0)
ptr.getCellRef().setLockLevel(abs(lockLevel)); //Changes lock to locklevel, in positive 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 else
ptr.getCellRef().setLockLevel(100); ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the origional one
}
} }
void Door::unlock (const MWWorld::Ptr& ptr) const void Door::unlock (const MWWorld::Ptr& ptr) const

2
apps/openmw/mwworld/class.hpp
View file

@ -165,7 +165,7 @@ namespace MWWorld
virtual bool hasInventoryStore (const Ptr& ptr) const; virtual bool hasInventoryStore (const Ptr& ptr) const;
///< Does this object have an inventory store, i.e. equipment slots? (default implementation: false) ///< 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) ///< Lock object (default implementation: throw an exception)
virtual void unlock (const Ptr& ptr) const; virtual void unlock (const Ptr& ptr) const;

2
apps/openmw/mwworld/worldimp.cpp
View file

@ -2526,7 +2526,7 @@ namespace MWWorld
store.remove(*it, it->getRefData().getCount(), ptr); store.remove(*it, it->getRefData().getCount(), ptr);
} }
} }
closestChest.getClass().lock(closestChest); closestChest.getClass().unlock(closestChest);
} }
} }