diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-16 14:37:36 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-02-16 14:37:36 +0100 |
| commit | 4908b6f500aa31ca550536c7e5a49e660ff72b65 (patch) | |
| tree | dc06fbfad743379da13f883b3bee655e116688e3 /src/Entities/Player.cpp | |
| parent | Merge pull request #685 from MuhammadWang/patch-1 (diff) | |
| download | cuberite-4908b6f500aa31ca550536c7e5a49e660ff72b65.tar cuberite-4908b6f500aa31ca550536c7e5a49e660ff72b65.tar.gz cuberite-4908b6f500aa31ca550536c7e5a49e660ff72b65.tar.bz2 cuberite-4908b6f500aa31ca550536c7e5a49e660ff72b65.tar.lz cuberite-4908b6f500aa31ca550536c7e5a49e660ff72b65.tar.xz cuberite-4908b6f500aa31ca550536c7e5a49e660ff72b65.tar.zst cuberite-4908b6f500aa31ca550536c7e5a49e660ff72b65.zip | |
Diffstat (limited to 'src/Entities/Player.cpp')
| -rw-r--r-- | src/Entities/Player.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index be26e4f6e..70ddb3c98 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -1059,15 +1059,6 @@ void cPlayer::CloseWindowIfID(char a_WindowID, bool a_CanRefuse) -void cPlayer::PlaySoundEffect(const AString & a_SoundName, float a_Volume, float a_Pitch) -{ - m_ClientHandle->SendSoundEffect(a_SoundName, (int) (GetPosX() * 8.0), (int) (GetPosY() * 8.0), (int) (GetPosZ() * 8.0), a_Volume, a_Pitch); -} - - - - - void cPlayer::SetLastBlockActionTime() { if (m_World != NULL) @@ -1796,7 +1787,7 @@ void cPlayer::HandleFood(void) Heal(1); m_FoodExhaustionLevel += 3; } - else if (m_FoodLevel <= 0 && m_Health > 1) + else if ((m_FoodLevel <= 0) && (m_Health > 1)) { // Damage from starving TakeDamage(dtStarving, NULL, 1, 1, 0); |