From 228f9b0ef48083a6cbf790cb418b3257c65b1df8 Mon Sep 17 00:00:00 2001 From: collett Date: Tue, 12 May 2020 04:15:52 +0900 Subject: [PATCH] should silent the sound effect as well --- src/world/Actor/PlayerInventory.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/world/Actor/PlayerInventory.cpp b/src/world/Actor/PlayerInventory.cpp index ff316229..fbff6d66 100644 --- a/src/world/Actor/PlayerInventory.cpp +++ b/src/world/Actor/PlayerInventory.cpp @@ -639,12 +639,13 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil lootMsg->data().param3 = originalQuantity; queuePacket( lootMsg ); } - - auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() ); - soundEffectPacket->data().sequence = 0xFFFFFFFF; - soundEffectPacket->data().type = 6; - queuePacket( soundEffectPacket ); - + if( !silent ) + { + auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() ); + soundEffectPacket->data().sequence = 0xFFFFFFFF; + soundEffectPacket->data().type = 6; + queuePacket( soundEffectPacket ); + } return item; } @@ -670,6 +671,11 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil { auto invUpdate = std::make_shared< UpdateInventorySlotPacket >( getId(), freeBagSlot.second, freeBagSlot.first, *itemToAdd ); queuePacket( invUpdate ); + + auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() ); + soundEffectPacket->data().sequence = 0xFFFFFFFF; + soundEffectPacket->data().type = 6; + queuePacket( soundEffectPacket ); } if( sendLootMessage ) @@ -682,11 +688,6 @@ Sapphire::ItemPtr Sapphire::Entity::Player::addItem( ItemPtr itemToAdd, bool sil queuePacket( lootMsg ); } - auto soundEffectPacket = makeZonePacket< FFXIVIpcInventoryActionAck >( getId() ); - soundEffectPacket->data().sequence = 0xFFFFFFFF; - soundEffectPacket->data().type = 6; - queuePacket( soundEffectPacket ); - return itemToAdd; }