diff options
author | Mattes D <github@xoft.cz> | 2014-10-21 22:02:30 +0200 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-10-21 22:02:30 +0200 |
commit | a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d (patch) | |
tree | ecd4214f8c2c11abb7bc0ff87cef26dd79ee6063 /src/Entities/ItemFrame.cpp | |
parent | Fixed trailing whitespace. (diff) | |
download | cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar.gz cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar.bz2 cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar.lz cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar.xz cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.tar.zst cuberite-a42fa071bc3ac1615e7c9b9d59fb4c882cc6097d.zip |
Diffstat (limited to 'src/Entities/ItemFrame.cpp')
-rw-r--r-- | src/Entities/ItemFrame.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Entities/ItemFrame.cpp b/src/Entities/ItemFrame.cpp index f512324eb..6704c05b4 100644 --- a/src/Entities/ItemFrame.cpp +++ b/src/Entities/ItemFrame.cpp @@ -9,10 +9,10 @@ -cItemFrame::cItemFrame(eBlockFace a_BlockFace, double a_X, double a_Y, double a_Z) - : cHangingEntity(etItemFrame, a_BlockFace, a_X, a_Y, a_Z) - , m_Item(E_BLOCK_AIR) - , m_Rotation(0) +cItemFrame::cItemFrame(eBlockFace a_BlockFace, double a_X, double a_Y, double a_Z) : + cHangingEntity(etItemFrame, a_BlockFace, a_X, a_Y, a_Z), + m_Item(E_BLOCK_AIR), + m_ItemRotation(0) { } @@ -27,10 +27,10 @@ void cItemFrame::OnRightClicked(cPlayer & a_Player) if (!m_Item.IsEmpty()) { // Item not empty, rotate, clipping values to zero to three inclusive - m_Rotation++; - if (m_Rotation >= 8) + m_ItemRotation++; + if (m_ItemRotation >= 8) { - m_Rotation = 0; + m_ItemRotation = 0; } } else if (!a_Player.GetEquippedItem().IsEmpty()) @@ -72,7 +72,7 @@ void cItemFrame::KilledBy(TakeDamageInfo & a_TDI) SetHealth(GetMaxHealth()); m_Item.Empty(); - m_Rotation = 0; + m_ItemRotation = 0; SetInvulnerableTicks(0); GetWorld()->BroadcastEntityMetadata(*this); } |