summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorJulian Laubstein <julianlaubstein@yahoo.de>2015-11-24 15:43:05 +0100
committerJulian Laubstein <julianlaubstein@yahoo.de>2015-11-24 15:43:05 +0100
commit412e5155a24339aa2a86f36e0ae5a9c5a0ff758d (patch)
treed63858a16962f83d68620bc55c8efeed126874a6 /src/Blocks
parentMerge pull request #2645 from Gargaj/followedarray (diff)
parentAdd enum for Sound and Particle Effects (diff)
downloadcuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar
cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar.gz
cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar.bz2
cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar.lz
cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar.xz
cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar.zst
cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockDoor.cpp3
-rw-r--r--src/Blocks/BlockFenceGate.h3
-rw-r--r--src/Blocks/BlockTrapdoor.h3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/Blocks/BlockDoor.cpp b/src/Blocks/BlockDoor.cpp
index af50834ef..30a8b8386 100644
--- a/src/Blocks/BlockDoor.cpp
+++ b/src/Blocks/BlockDoor.cpp
@@ -1,6 +1,7 @@
#include "Globals.h"
#include "BlockDoor.h"
+#include "../EffectID.h"
#include "../Entities/Player.h"
@@ -64,7 +65,7 @@ void cBlockDoorHandler::OnUse(cChunkInterface & a_ChunkInterface, cWorldInterfac
case E_BLOCK_OAK_DOOR:
{
ChangeDoor(a_ChunkInterface, a_BlockX, a_BlockY, a_BlockZ);
- a_Player->GetWorld()->BroadcastSoundParticleEffect(1003, a_BlockX, a_BlockY, a_BlockZ, 0, a_Player->GetClientHandle());
+ a_Player->GetWorld()->BroadcastSoundParticleEffect(EffectID::SFX_RANDOM_DOOR_OPEN_CLOSE, a_BlockX, a_BlockY, a_BlockZ, 0, a_Player->GetClientHandle());
break;
}
// Prevent iron door from opening on player click
diff --git a/src/Blocks/BlockFenceGate.h b/src/Blocks/BlockFenceGate.h
index 81e93fa50..241771a90 100644
--- a/src/Blocks/BlockFenceGate.h
+++ b/src/Blocks/BlockFenceGate.h
@@ -3,6 +3,7 @@
#include "BlockHandler.h"
#include "MetaRotator.h"
+#include "../EffectID.h"
@@ -49,7 +50,7 @@ public:
// Standing aside - use last direction
a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, OldMetaData);
}
- a_Player->GetWorld()->BroadcastSoundParticleEffect(1003, a_BlockX, a_BlockY, a_BlockZ, 0, a_Player->GetClientHandle());
+ a_Player->GetWorld()->BroadcastSoundParticleEffect(EffectID::SFX_RANDOM_DOOR_OPEN_CLOSE, a_BlockX, a_BlockY, a_BlockZ, 0, a_Player->GetClientHandle());
}
virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override
diff --git a/src/Blocks/BlockTrapdoor.h b/src/Blocks/BlockTrapdoor.h
index f7f83a61d..4c5cb410b 100644
--- a/src/Blocks/BlockTrapdoor.h
+++ b/src/Blocks/BlockTrapdoor.h
@@ -3,6 +3,7 @@
#include "BlockHandler.h"
#include "MetaRotator.h"
+#include "../EffectID.h"
@@ -40,7 +41,7 @@ public:
a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta);
cWorld * World = static_cast<cWorld *>(&a_WorldInterface);
- World->BroadcastSoundParticleEffect(1003, a_BlockX, a_BlockY, a_BlockZ, 0, a_Player->GetClientHandle());
+ World->BroadcastSoundParticleEffect(EffectID::SFX_RANDOM_DOOR_OPEN_CLOSE, a_BlockX, a_BlockY, a_BlockZ, 0, a_Player->GetClientHandle());
}
virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override