mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-21 12:23:51 +00:00
Merge branch 'master' of https://github.com/zinnschlag/openmw
This commit is contained in:
commit
f13a279520
1 changed files with 3 additions and 3 deletions
|
@ -26,9 +26,9 @@ namespace MWMechanics
|
|||
return mBase;
|
||||
}
|
||||
|
||||
const T& getModified() const
|
||||
T getModified() const
|
||||
{
|
||||
return mModified;
|
||||
return std::max(static_cast<T>(0), mModified);
|
||||
}
|
||||
|
||||
T getModifier() const
|
||||
|
@ -108,7 +108,7 @@ namespace MWMechanics
|
|||
return mStatic.getBase();
|
||||
}
|
||||
|
||||
const T& getModified() const
|
||||
T getModified() const
|
||||
{
|
||||
return mStatic.getModified();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue