mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-16 16:20:53 +00:00
Merge branch 'master' of https://github.com/zinnschlag/openmw
This commit is contained in:
commit
f13a279520
@ -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…
x
Reference in New Issue
Block a user