diff options
author | archshift <admin@archshift.com> | 2014-08-03 07:35:29 +0200 |
---|---|---|
committer | archshift <admin@archshift.com> | 2014-08-03 07:35:29 +0200 |
commit | 9ecce2366e81ae66c77312220e378ff2f1b02a24 (patch) | |
tree | 49d909ee4e16da9cc8c146aa968052c2480c16a7 /src/Entities/Player.cpp | |
parent | Removed unused cPlayer::FoodPoison function (diff) | |
download | cuberite-9ecce2366e81ae66c77312220e378ff2f1b02a24.tar cuberite-9ecce2366e81ae66c77312220e378ff2f1b02a24.tar.gz cuberite-9ecce2366e81ae66c77312220e378ff2f1b02a24.tar.bz2 cuberite-9ecce2366e81ae66c77312220e378ff2f1b02a24.tar.lz cuberite-9ecce2366e81ae66c77312220e378ff2f1b02a24.tar.xz cuberite-9ecce2366e81ae66c77312220e378ff2f1b02a24.tar.zst cuberite-9ecce2366e81ae66c77312220e378ff2f1b02a24.zip |
Diffstat (limited to 'src/Entities/Player.cpp')
-rw-r--r-- | src/Entities/Player.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index d3d5a61d4..d1d7349a6 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -527,7 +527,7 @@ void cPlayer::SetFoodLevel(int a_FoodLevel) void cPlayer::SetFoodSaturationLevel(double a_FoodSaturationLevel) { - m_FoodSaturationLevel = std::max(0.0, std::min(a_FoodSaturationLevel, (double)m_FoodLevel)); + m_FoodSaturationLevel = Clamp(a_FoodSaturationLevel, 0.0, (double) m_FoodLevel); } @@ -545,7 +545,7 @@ void cPlayer::SetFoodTickTimer(int a_FoodTickTimer) void cPlayer::SetFoodExhaustionLevel(double a_FoodExhaustionLevel) { - m_FoodExhaustionLevel = std::max(0.0, std::min(a_FoodExhaustionLevel, 40.0)); + m_FoodExhaustionLevel = Clamp(a_FoodExhaustionLevel, 0.0, 40.0); } @@ -700,16 +700,13 @@ double cPlayer::GetMaxSpeed(void) const { return m_FlyingMaxSpeed; } + else if (m_IsSprinting) + { + return m_SprintingMaxSpeed; + } else { - if (m_IsSprinting) - { - return m_SprintingMaxSpeed; - } - else - { - return m_NormalMaxSpeed; - } + return m_NormalMaxSpeed; } } |