summaryrefslogtreecommitdiffstats
path: root/src/Items/ItemLighter.h
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-03-17 17:44:34 +0100
committerTycho <work.tycho+git@gmail.com>2014-03-17 17:44:34 +0100
commit90ab055eab62b35a8ddc681e6d79aa1d42afae9f (patch)
treeb71798809ca05c1d904a18083a8c652a4954306a /src/Items/ItemLighter.h
parentMade buffers static const (diff)
parentFixed double to float conversions. (diff)
downloadcuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar.gz
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar.bz2
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar.lz
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar.xz
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.tar.zst
cuberite-90ab055eab62b35a8ddc681e6d79aa1d42afae9f.zip
Diffstat (limited to 'src/Items/ItemLighter.h')
-rw-r--r--src/Items/ItemLighter.h22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/Items/ItemLighter.h b/src/Items/ItemLighter.h
index 18873e911..2db6c829a 100644
--- a/src/Items/ItemLighter.h
+++ b/src/Items/ItemLighter.h
@@ -26,7 +26,26 @@ public:
return false;
}
- a_Player->UseEquippedItem();
+ if (!a_Player->IsGameModeCreative())
+ {
+ switch (m_ItemType)
+ {
+ case E_ITEM_FLINT_AND_STEEL:
+ {
+ a_Player->UseEquippedItem();
+ break;
+ }
+ case E_ITEM_FIRE_CHARGE:
+ {
+ a_Player->GetInventory().RemoveOneEquippedItem();
+ break;
+ }
+ default:
+ {
+ ASSERT(!"Unknown Lighter Item!");
+ }
+ }
+ }
switch (a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ))
{
@@ -49,6 +68,7 @@ public:
if (a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ) == E_BLOCK_AIR)
{
a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_FIRE, 0);
+ a_World->BroadcastSoundEffect("fire.ignite", a_BlockX * 8, a_BlockY * 8, a_BlockZ * 8, 1.0F, 1.04F);
break;
}
}