summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/FlowerPotEntity.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-10-21 21:16:04 +0200
committerHowaner <franzi.moos@googlemail.com>2014-10-21 21:16:04 +0200
commit6f99615cebba82edcad3d6b3981915285bbefc90 (patch)
treea8213436004b417555927f8f094198305a46af40 /src/BlockEntities/FlowerPotEntity.cpp
parentstyle. (diff)
parentMerged branch 'master' of git://github.com/sriehl/MCServer (diff)
downloadcuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar
cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.gz
cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.bz2
cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.lz
cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.xz
cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.zst
cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.zip
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/FlowerPotEntity.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/BlockEntities/FlowerPotEntity.cpp b/src/BlockEntities/FlowerPotEntity.cpp
index 01560f814..ad7b496cc 100644
--- a/src/BlockEntities/FlowerPotEntity.cpp
+++ b/src/BlockEntities/FlowerPotEntity.cpp
@@ -28,7 +28,7 @@ void cFlowerPotEntity::UsedBy(cPlayer * a_Player)
{
return;
}
-
+
cItem SelectedItem = a_Player->GetInventory().GetEquippedItem();
if (IsFlower(SelectedItem.m_ItemType, SelectedItem.m_ItemDamage))
{
@@ -63,7 +63,7 @@ void cFlowerPotEntity::Destroy(void)
cItems Pickups;
Pickups.Add(m_Item);
m_World->SpawnItemPickups(Pickups, m_PosX + 0.5, m_PosY + 0.5, m_PosZ + 0.5);
-
+
m_Item.Empty();
}
}
@@ -88,7 +88,7 @@ bool cFlowerPotEntity::IsFlower(short m_ItemType, short m_ItemData)
}
case E_BLOCK_TALL_GRASS:
{
- return (m_ItemData == (short) 2);
+ return (m_ItemData == static_cast<short>(2));
}
default:
{
@@ -96,7 +96,3 @@ bool cFlowerPotEntity::IsFlower(short m_ItemType, short m_ItemData)
}
}
}
-
-
-
-