flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Code reduction and clarity fixes

This commit is contained in:
archshift 2014-08-02 22:35:29 -07:00
parent 3ffec92e79
commit 9ecce2366e
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Entities/Entity.cpp
View File

@ -543,10 +543,7 @@ void cEntity::KilledBy(TakeDamageInfo & a_TDI)
void cEntity::Heal(int a_HitPoints) void cEntity::Heal(int a_HitPoints)
{ {
m_Health += a_HitPoints; m_Health += a_HitPoints;
if (m_Health > m_MaxHealth) m_Health = std::min(m_Health, m_MaxHealth);
{
m_Health = m_MaxHealth;
}
} }
@ -555,7 +552,7 @@ void cEntity::Heal(int a_HitPoints)
void cEntity::SetHealth(int a_Health) void cEntity::SetHealth(int a_Health)
{ {
m_Health = std::max(0, std::min(m_MaxHealth, a_Health)); m_Health = Clamp(a_Health, 0, m_MaxHealth);
} }
@ -1264,10 +1261,10 @@ void cEntity::HandleAir(void)
SetSpeedY(1); // Float in the water SetSpeedY(1); // Float in the water
} }
// Either reduce air level or damage player if (m_AirLevel <= 0)
if (m_AirLevel < 1)
{ {
if (m_AirTickTimer < 1) // Either reduce air level or damage player
if (m_AirTickTimer <= 0)
{ {
// Damage player // Damage player
TakeDamage(dtDrowning, NULL, 1, 1, 0); TakeDamage(dtDrowning, NULL, 1, 1, 0);
@ -1552,17 +1549,10 @@ void cEntity::SetHeight(double a_Height)
void cEntity::SetMass(double a_Mass) void cEntity::SetMass(double a_Mass)
{ {
if (a_Mass > 0) // Make sure that mass is not zero. 1g is the default because we
{ // have to choose a number. It's perfectly legal to have a mass
m_Mass = a_Mass; // less than 1g as long as is NOT equal or less than zero.
} m_Mass = std::max(a_Mass, 0.001);
else
{
// Make sure that mass is not zero. 1g is the default because we
// have to choose a number. It's perfectly legal to have a mass
// less than 1g as long as is NOT equal or less than zero.
m_Mass = 0.001;
}
} }

17
src/Entities/Player.cpp
View File

@ -527,7 +527,7 @@ void cPlayer::SetFoodLevel(int a_FoodLevel)
void cPlayer::SetFoodSaturationLevel(double a_FoodSaturationLevel) 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) 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; return m_FlyingMaxSpeed;
} }
else if (m_IsSprinting)
{
return m_SprintingMaxSpeed;
}
else else
{ {
if (m_IsSprinting) return m_NormalMaxSpeed;
{
return m_SprintingMaxSpeed;
}
else
{
return m_NormalMaxSpeed;
}
} }
} }