From dae2adde6563bec4b614230992cae6b1ca965b4f Mon Sep 17 00:00:00 2001 From: mathiascode Date: Wed, 15 Feb 2017 07:05:24 +0200 Subject: Updated sounds and effect IDs (#3422) --- src/UI/ChestWindow.cpp | 6 +++--- src/UI/EnderChestWindow.cpp | 4 ++-- src/UI/MinecartWithChestWindow.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/UI') diff --git a/src/UI/ChestWindow.cpp b/src/UI/ChestWindow.cpp index bc94ec8fd..e889f9c44 100644 --- a/src/UI/ChestWindow.cpp +++ b/src/UI/ChestWindow.cpp @@ -27,7 +27,7 @@ cChestWindow::cChestWindow(cChestEntity * a_Chest) : m_SlotAreas.push_back(new cSlotAreaHotBar(*this)); // Play the opening sound: - m_World->BroadcastSoundEffect("random.chestopen", static_cast(m_BlockX), static_cast(m_BlockY), static_cast(m_BlockZ), 1, 1); + m_World->BroadcastSoundEffect("block.chest.open", static_cast(m_BlockX), static_cast(m_BlockY), static_cast(m_BlockZ), 1, 1); // Send out the chest-open packet: m_World->BroadcastBlockAction(m_BlockX, m_BlockY, m_BlockZ, 1, 1, a_Chest->GetBlockType()); @@ -51,7 +51,7 @@ cChestWindow::cChestWindow(cChestEntity * a_PrimaryChest, cChestEntity * a_Secon m_SlotAreas.push_back(new cSlotAreaHotBar(*this)); // Play the opening sound: - m_World->BroadcastSoundEffect("random.chestopen", static_cast(m_BlockX), static_cast(m_BlockY), static_cast(m_BlockZ), 1, 1); + m_World->BroadcastSoundEffect("block.chest.open", static_cast(m_BlockX), static_cast(m_BlockY), static_cast(m_BlockZ), 1, 1); // Send out the chest-open packet: m_World->BroadcastBlockAction(m_BlockX, m_BlockY, m_BlockZ, 1, 1, a_PrimaryChest->GetBlockType()); @@ -66,7 +66,7 @@ cChestWindow::~cChestWindow() // Send out the chest-close packet: m_World->BroadcastBlockAction(m_BlockX, m_BlockY, m_BlockZ, 1, 0, m_PrimaryChest->GetBlockType()); - m_World->BroadcastSoundEffect("random.chestclosed", static_cast(m_BlockX), static_cast(m_BlockY), static_cast(m_BlockZ), 1, 1); + m_World->BroadcastSoundEffect("block.chest.close", static_cast(m_BlockX), static_cast(m_BlockY), static_cast(m_BlockZ), 1, 1); } diff --git a/src/UI/EnderChestWindow.cpp b/src/UI/EnderChestWindow.cpp index c597f3a9b..ed0fb499f 100644 --- a/src/UI/EnderChestWindow.cpp +++ b/src/UI/EnderChestWindow.cpp @@ -25,7 +25,7 @@ cEnderChestWindow::cEnderChestWindow(cEnderChestEntity * a_EnderChest) : // Play the opening sound: m_World->BroadcastSoundEffect( - "random.chestopen", + "block.enderchest.open", static_cast(m_BlockX), static_cast(m_BlockY), static_cast(m_BlockZ), @@ -48,7 +48,7 @@ cEnderChestWindow::~cEnderChestWindow() // Play the closing sound m_World->BroadcastSoundEffect( - "random.chestclosed", + "block.enderchest.close", static_cast(m_BlockX), static_cast(m_BlockY), static_cast(m_BlockZ), diff --git a/src/UI/MinecartWithChestWindow.h b/src/UI/MinecartWithChestWindow.h index 87e8f6137..5e3c28512 100644 --- a/src/UI/MinecartWithChestWindow.h +++ b/src/UI/MinecartWithChestWindow.h @@ -30,7 +30,7 @@ public: m_SlotAreas.push_back(new cSlotAreaInventory(*this)); m_SlotAreas.push_back(new cSlotAreaHotBar(*this)); - a_ChestCart->GetWorld()->BroadcastSoundEffect("random.chestopen", a_ChestCart->GetPosX(), a_ChestCart->GetPosY(), a_ChestCart->GetPosZ(), 1, 1); + a_ChestCart->GetWorld()->BroadcastSoundEffect("block.chest.open", a_ChestCart->GetPosX(), a_ChestCart->GetPosY(), a_ChestCart->GetPosZ(), 1, 1); } virtual void DistributeStack(cItem & a_ItemStack, int a_Slot, cPlayer & a_Player, cSlotArea * a_ClickedArea, bool a_ShouldApply) override @@ -55,7 +55,7 @@ public: ~cMinecartWithChestWindow() { - m_ChestCart->GetWorld()->BroadcastSoundEffect("random.chestclosed", m_ChestCart->GetPosX(), m_ChestCart->GetPosY(), m_ChestCart->GetPosZ(), 1, 1); + m_ChestCart->GetWorld()->BroadcastSoundEffect("block.chest.close", m_ChestCart->GetPosX(), m_ChestCart->GetPosY(), m_ChestCart->GetPosZ(), 1, 1); } private: -- cgit v1.2.3