summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-19 10:40:29 +0200
committerarchshift <admin@archshift.com>2014-07-19 10:40:29 +0200
commit041bfd5860cd8ef51db42eb6fb4b50b45549feba (patch)
tree2d93a68b888a5e2b410ec95d124edaad6f67bb92 /src/Entities
parentRenamed AllToLua_lua script. (diff)
downloadcuberite-041bfd5860cd8ef51db42eb6fb4b50b45549feba.tar
cuberite-041bfd5860cd8ef51db42eb6fb4b50b45549feba.tar.gz
cuberite-041bfd5860cd8ef51db42eb6fb4b50b45549feba.tar.bz2
cuberite-041bfd5860cd8ef51db42eb6fb4b50b45549feba.tar.lz
cuberite-041bfd5860cd8ef51db42eb6fb4b50b45549feba.tar.xz
cuberite-041bfd5860cd8ef51db42eb6fb4b50b45549feba.tar.zst
cuberite-041bfd5860cd8ef51db42eb6fb4b50b45549feba.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Entity.cpp5
-rw-r--r--src/Entities/Player.cpp5
-rw-r--r--src/Entities/SplashPotionEntity.cpp5
3 files changed, 3 insertions, 12 deletions
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index 61b28ec70..f9331ede8 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -327,10 +327,7 @@ bool cEntity::DoTakeDamage(TakeDamageInfo & a_TDI)
// TODO: Apply damage to armor
- if (m_Health < 0)
- {
- m_Health = 0;
- }
+ m_Health = std::max(m_Health, 0);
if ((IsMob() || IsPlayer()) && (a_TDI.Attacker != NULL)) // Knockback for only players and mobs
{
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index ea11926b8..7376441b4 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -382,10 +382,7 @@ short cPlayer::DeltaExperience(short a_Xp_delta)
m_CurrentXp += a_Xp_delta;
// Make sure they didn't subtract too much
- if (m_CurrentXp < 0)
- {
- m_CurrentXp = 0;
- }
+ m_CurrentXp = std::max<short int>(m_CurrentXp, 0);
// Update total for score calculation
if (a_Xp_delta > 0)
diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp
index 3efb1f25d..ccadf9c8e 100644
--- a/src/Entities/SplashPotionEntity.cpp
+++ b/src/Entities/SplashPotionEntity.cpp
@@ -44,10 +44,7 @@ public:
// y = -0.25x + 1, where x is the distance from the player. Approximation for potion splash.
// TODO: better equation
double Reduction = -0.25 * SplashDistance + 1.0;
- if (Reduction < 0)
- {
- Reduction = 0;
- }
+ Reduction = std::max(Reduction, 0.0);
((cPawn *) a_Entity)->AddEntityEffect(m_EntityEffectType, m_EntityEffect.GetDuration(), m_EntityEffect.GetIntensity(), Reduction);
return false;