mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:53:51 +00:00
Code Issues Releases Wiki Activity

Accept a ConstPtr in canLock

Browse source
This commit is contained in:
scrawl 2015-12-18 16:50:32 +01:00
parent c43f80633a
commit 266fbbef48
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -279,7 +279,7 @@ namespace MWClass
ptr.getCellRef().setLockLevel(-abs(ptr.getCellRef().getLockLevel())); //Makes lockLevel negative ptr.getCellRef().setLockLevel(-abs(ptr.getCellRef().getLockLevel())); //Makes lockLevel negative
} }
bool Container::canLock(const MWWorld::Ptr &ptr) const bool Container::canLock(const MWWorld::ConstPtr &ptr) const
{ {
return true; return true;
} }

2
apps/openmw/mwclass/container.hpp
View file

@ -56,7 +56,7 @@ namespace MWClass
virtual void unlock (const MWWorld::Ptr& ptr) const; virtual void unlock (const MWWorld::Ptr& ptr) const;
///< Unlock object ///< Unlock object
virtual bool canLock(const MWWorld::Ptr &ptr) const; virtual bool canLock(const MWWorld::ConstPtr &ptr) const;
virtual void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) virtual void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state)
const; const;

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

@ -209,7 +209,7 @@ namespace MWClass
ptr.getCellRef().setLockLevel(-abs(ptr.getCellRef().getLockLevel())); //Makes lockLevel negative ptr.getCellRef().setLockLevel(-abs(ptr.getCellRef().getLockLevel())); //Makes lockLevel negative
} }
bool Door::canLock(const MWWorld::Ptr &ptr) const bool Door::canLock(const MWWorld::ConstPtr &ptr) const
{ {
return true; return true;
} }

2
apps/openmw/mwclass/door.hpp
View file

@ -46,7 +46,7 @@ namespace MWClass
virtual void unlock (const MWWorld::Ptr& ptr) const; virtual void unlock (const MWWorld::Ptr& ptr) const;
///< Unlock object ///< Unlock object
virtual bool canLock(const MWWorld::Ptr &ptr) const; virtual bool canLock(const MWWorld::ConstPtr &ptr) const;
virtual std::string getScript (const MWWorld::ConstPtr& ptr) const; virtual std::string getScript (const MWWorld::ConstPtr& ptr) const;
///< Return name of the script attached to ptr ///< Return name of the script attached to ptr

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

@ -143,7 +143,7 @@ namespace MWWorld
throw std::runtime_error ("class does not support unlocking"); throw std::runtime_error ("class does not support unlocking");
} }
bool Class::canLock(const Ptr &ptr) const bool Class::canLock(const ConstPtr &ptr) const
{ {
return false; return false;
} }

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

@ -161,7 +161,7 @@ namespace MWWorld
virtual void unlock (const Ptr& ptr) const; virtual void unlock (const Ptr& ptr) const;
///< Unlock object (default implementation: throw an exception) ///< Unlock object (default implementation: throw an exception)
virtual bool canLock (const Ptr& ptr) const; virtual bool canLock (const ConstPtr& ptr) const;
virtual void setRemainingUsageTime (const Ptr& ptr, float duration) const; virtual void setRemainingUsageTime (const Ptr& ptr, float duration) const;
///< Sets the remaining duration of the object, such as an equippable light ///< Sets the remaining duration of the object, such as an equippable light