diff options
| author | Aqua Deus <95978183+aquadeus@users.noreply.github.com> | 2022-02-06 14:56:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-06 14:56:11 +0100 |
| commit | e5417e9ce747d92822538da77d32cf7d0f26ce8a (patch) | |
| tree | b4f1ff12a30656af835a0884897f4ecc7249b00a /src/server/game/Server | |
| parent | 873e92d3b4f26801ddb341c04f658547170886a5 (diff) | |
Core/PacketIO: Implemented SMSG_DISPLAY_TOAST for quest money rewards (#27669)
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/ItemPacketsCommon.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/MiscPackets.cpp | 30 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/MiscPackets.h | 22 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.cpp | 2 |
4 files changed, 54 insertions, 2 deletions
diff --git a/src/server/game/Server/Packets/ItemPacketsCommon.cpp b/src/server/game/Server/Packets/ItemPacketsCommon.cpp index 75e75cec607..6c12a6dde1e 100644 --- a/src/server/game/Server/Packets/ItemPacketsCommon.cpp +++ b/src/server/game/Server/Packets/ItemPacketsCommon.cpp @@ -78,7 +78,7 @@ void ItemInstance::Initialize(UF::SocketedGem const* gem) void ItemInstance::Initialize(::LootItem const& lootItem) { - ItemID = lootItem.itemid; + ItemID = lootItem.itemid; if (!lootItem.BonusListIDs.empty() || lootItem.randomBonusListId) { diff --git a/src/server/game/Server/Packets/MiscPackets.cpp b/src/server/game/Server/Packets/MiscPackets.cpp index f464af32b02..b32a182d916 100644 --- a/src/server/game/Server/Packets/MiscPackets.cpp +++ b/src/server/game/Server/Packets/MiscPackets.cpp @@ -741,3 +741,33 @@ WorldPacket const* WorldPackets::Misc::SplashScreenShowLatest::Write() return &_worldPacket; } + +WorldPacket const* WorldPackets::Misc::DisplayToast::Write() +{ + _worldPacket << uint64(Quantity); + _worldPacket << uint8(AsUnderlyingType(DisplayToastMethod)); + _worldPacket << uint32(QuestID); + + _worldPacket.WriteBit(Mailed); + _worldPacket.WriteBits(AsUnderlyingType(Type), 2); + _worldPacket.WriteBit(IsSecondaryResult); + + switch (Type) + { + case DisplayToastType::NewItem: + _worldPacket.WriteBit(BonusRoll); + _worldPacket << Item; + _worldPacket << int32(LootSpec); + _worldPacket << int32(Gender); + break; + case DisplayToastType::NewCurrency: + _worldPacket << uint32(CurrencyID); + break; + default: + break; + } + + _worldPacket.FlushBits(); + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h index 373c756c11a..fe552a4df20 100644 --- a/src/server/game/Server/Packets/MiscPackets.h +++ b/src/server/game/Server/Packets/MiscPackets.h @@ -21,9 +21,11 @@ #include "Packet.h" #include "CollectionMgr.h" #include "CUFProfile.h" +#include "ItemPacketsCommon.h" #include "ObjectGuid.h" #include "Optional.h" #include "PacketUtilities.h" +#include "Player.h" #include "Position.h" #include "SharedDefines.h" #include <array> @@ -964,6 +966,26 @@ namespace WorldPackets int32 UISplashScreenID = 0; }; + + class DisplayToast final : public ServerPacket + { + public: + DisplayToast() : ServerPacket(SMSG_DISPLAY_TOAST) { } + + WorldPacket const* Write() override; + + uint64 Quantity = 0; + ::DisplayToastMethod DisplayToastMethod = ::DisplayToastMethod::DoNotDisplay; + bool Mailed = false; + DisplayToastType Type = DisplayToastType::Money; + uint32 QuestID = 0; + bool IsSecondaryResult = false; + Item::ItemInstance Item; + bool BonusRoll = false; + int32 LootSpec = 0; + ::Gender Gender = GENDER_NONE; + uint32 CurrencyID = 0; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 6be93de627c..c6eb22356ca 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1218,7 +1218,7 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_PROMOTION, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_QUEST_POPUP, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_SOULBIND_UPDATE_MESSAGE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_TOAST, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_TOAST, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_DISPLAY_WORLD_TEXT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_DONT_AUTO_PUSH_SPELLS_TO_ACTION_BAR, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_DROP_NEW_CONNECTION, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); |
