From f7ac6296b6d5ee10f4248f64ee090950499cd12d Mon Sep 17 00:00:00 2001 From: ForesterDev <11771800+ForesterDev@users.noreply.github.com> Date: Fri, 29 May 2020 19:26:53 +0300 Subject: Core/PacketIO: Create BankHandler & update bank opcodes to new packet class (#24695) * Core/PacketIO: Create BankHandler & update bank opcodes to new packet class (cherry picked from commit 478e86c074cc9c6a19f6c83d2a265eb1ccd705fc) * fix nopch build * Update SMSG_BUY_BANK_SLOT_RESULT * fix naming * fix copypaste error Co-authored-by: Luzifix --- src/server/game/Server/Packets/AllPackets.h | 1 + src/server/game/Server/Packets/BankPackets.cpp | 49 ++++++++++++++++ src/server/game/Server/Packets/BankPackets.h | 81 ++++++++++++++++++++++++++ src/server/game/Server/WorldSession.h | 17 ++++-- 4 files changed, 144 insertions(+), 4 deletions(-) create mode 100644 src/server/game/Server/Packets/BankPackets.cpp create mode 100644 src/server/game/Server/Packets/BankPackets.h (limited to 'src/server/game/Server') diff --git a/src/server/game/Server/Packets/AllPackets.h b/src/server/game/Server/Packets/AllPackets.h index 3fdad4e577f..5fb2c5b9e82 100644 --- a/src/server/game/Server/Packets/AllPackets.h +++ b/src/server/game/Server/Packets/AllPackets.h @@ -18,6 +18,7 @@ #ifndef AllPackets_h__ #define AllPackets_h__ +#include "BankPackets.h" #include "CharacterPackets.h" #include "ChatPackets.h" #include "CombatLogPackets.h" diff --git a/src/server/game/Server/Packets/BankPackets.cpp b/src/server/game/Server/Packets/BankPackets.cpp new file mode 100644 index 00000000000..3356d293ed7 --- /dev/null +++ b/src/server/game/Server/Packets/BankPackets.cpp @@ -0,0 +1,49 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include "BankPackets.h" + +void WorldPackets::Bank::AutoBankItem::Read() +{ + _worldPacket >> Bag; + _worldPacket >> Slot; +} + +void WorldPackets::Bank::AutoStoreBankItem::Read() +{ + _worldPacket >> Bag; + _worldPacket >> Slot; +} + +void WorldPackets::Bank::BuyBankSlot::Read() +{ + _worldPacket >> Banker; +} + +WorldPacket const* WorldPackets::Bank::BuyBankSlotResult::Write() +{ + _worldPacket << uint32(Result); + + return &_worldPacket; +} + +WorldPacket const* WorldPackets::Bank::ShowBank::Write() +{ + _worldPacket << Banker; + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/BankPackets.h b/src/server/game/Server/Packets/BankPackets.h new file mode 100644 index 00000000000..8cff53f4912 --- /dev/null +++ b/src/server/game/Server/Packets/BankPackets.h @@ -0,0 +1,81 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#ifndef BankPackets_h__ +#define BankPackets_h__ + +#include "Packet.h" +#include "ObjectGuid.h" + +namespace WorldPackets +{ + namespace Bank + { + class AutoBankItem final : public ClientPacket + { + public: + AutoBankItem(WorldPacket&& packet) : ClientPacket(CMSG_AUTOBANK_ITEM, std::move(packet)) { } + + void Read() override; + + uint8 Bag = 0; + uint8 Slot = 0; + }; + + class AutoStoreBankItem final : public ClientPacket + { + public: + AutoStoreBankItem(WorldPacket&& packet) : ClientPacket(CMSG_AUTOSTORE_BANK_ITEM, std::move(packet)) { } + + void Read() override; + + uint8 Bag = 0; + uint8 Slot = 0; + }; + + class BuyBankSlot final : public ClientPacket + { + public: + BuyBankSlot(WorldPacket&& packet) : ClientPacket(CMSG_BUY_BANK_SLOT, std::move(packet)) { } + + void Read() override; + + ObjectGuid Banker; + }; + + class BuyBankSlotResult final : public ServerPacket + { + public: + BuyBankSlotResult() : ServerPacket(SMSG_BUY_BANK_SLOT_RESULT, 4) { } + + WorldPacket const* Write() override; + + uint32 Result; + }; + + class ShowBank final : public ServerPacket + { + public: + ShowBank() : ServerPacket(SMSG_SHOW_BANK, 8) { } + + WorldPacket const* Write() override; + + ObjectGuid Banker; + }; + } +} +#endif // BankPackets_h__ diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index cdc1c77111e..57794ac81bf 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -78,6 +78,13 @@ class RBACData; namespace WorldPackets { + namespace Bank + { + class AutoBankItem; + class AutoStoreBankItem; + class BuyBankSlot; + } + namespace Character { class LogoutCancel; @@ -755,8 +762,6 @@ class TC_GAME_API WorldSession void SendActivateTaxiReply(ActivateTaxiReply reply); void HandleTabardVendorActivateOpcode(WorldPacket& recvPacket); - void HandleBankerActivateOpcode(WorldPacket& recvPacket); - void HandleBuyBankSlotOpcode(WorldPacket& recvPacket); void HandleTrainerListOpcode(WorldPackets::NPC::Hello& packet); void HandleTrainerBuySpellOpcode(WorldPackets::NPC::TrainerBuySpell& packet); void HandlePetitionShowListOpcode(WorldPacket& recvPacket); @@ -798,6 +803,12 @@ class TC_GAME_API WorldSession void HandleAuctionPlaceBid(WorldPacket& recvData); void HandleAuctionListPendingSales(WorldPacket& recvData); + // Bank + void HandleBankerActivateOpcode(WorldPackets::NPC::Hello& packet); + void HandleAutoBankItemOpcode(WorldPackets::Bank::AutoBankItem& packet); + void HandleAutoStoreBankItemOpcode(WorldPackets::Bank::AutoStoreBankItem& packet); + void HandleBuyBankSlotOpcode(WorldPackets::Bank::BuyBankSlot& buyBankSlot); + void HandleGetMailList(WorldPacket& recvData); void HandleSendMail(WorldPacket& recvData); void HandleMailTakeMoney(WorldPacket& recvData); @@ -823,8 +834,6 @@ class TC_GAME_API WorldSession void HandleAutoEquipItemSlotOpcode(WorldPacket& recvPacket); void HandleSwapItem(WorldPacket& recvPacket); void HandleBuybackItem(WorldPacket& recvPacket); - void HandleAutoBankItemOpcode(WorldPacket& recvPacket); - void HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket); void HandleWrapItemOpcode(WorldPacket& recvPacket); void HandleAttackSwingOpcode(WorldPackets::Combat::AttackSwing& packet); -- cgit v1.2.3