Merge pull request #14343 from DJScias/opcodes1

Core/Packets: updated and enabled SMSG_SELL_RESPONSE
This commit is contained in:
Carbenium
2015-03-11 21:24:29 +01:00
5 changed files with 28 additions and 7 deletions

View File

@@ -12918,11 +12918,11 @@ void Player::SendBuyError(BuyResult msg, Creature* creature, uint32 item, uint32
void Player::SendSellError(SellResult msg, Creature* creature, ObjectGuid guid)
{
TC_LOG_DEBUG("network", "WORLD: Sent SMSG_SELL_RESPONSE");
WorldPacket data(SMSG_SELL_RESPONSE, (8+8+1)); // last check 4.3.4
data << (creature ? creature->GetGUID() : ObjectGuid::Empty);
data << guid;
data << uint8(msg);
GetSession()->SendPacket(&data);
WorldPackets::Item::SellResponse sellResponse;
sellResponse.VendorGUID = (creature ? creature->GetGUID() : ObjectGuid::Empty);
sellResponse.ItemGUID = guid;
sellResponse.Reason = msg;
GetSession()->SendPacket(sellResponse.Write());
}
bool Player::IsUseEquipedWeapon(bool mainhand) const

View File

@@ -271,3 +271,12 @@ void WorldPackets::Item::DestroyItem::Read()
>> ContainerId
>> SlotNum;
}
WorldPacket const* WorldPackets::Item::SellResponse::Write()
{
_worldPacket << VendorGUID
<< ItemGUID
<< uint8(Reason);
return &_worldPacket;
}

View File

@@ -258,6 +258,18 @@ namespace WorldPackets
uint8 ContainerId = 0;
};
class SellResponse final : public ServerPacket
{
public:
SellResponse() : ServerPacket(SMSG_SELL_RESPONSE, 8 + 8 + 1) { }
WorldPacket const* Write() override;
ObjectGuid VendorGUID;
ObjectGuid ItemGUID;
SellResult Reason;
};
ByteBuffer& operator>>(ByteBuffer& data, InvUpdate& invUpdate);
}
}

View File

@@ -1712,7 +1712,7 @@ void OpcodeTable::Initialize()
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_REPLACEMENTS_MADE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCENE_OBJECT_PET_BATTLE_ROUND_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SCRIPT_CAST, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SELL_RESPONSE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SELL_RESPONSE, STATUS_NEVER, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SEND_ITEM_PASSIVES, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SEND_MAIL_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SEND_RAID_TARGET_UPDATE_ALL, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);

View File

@@ -1659,7 +1659,7 @@ enum OpcodeServer : uint32
SMSG_SCENE_OBJECT_PET_BATTLE_ROUND_RESULT = 0xBADD,
SMSG_SCRIPT_CAST = 0xBADD,
SMSG_SCRIPT_MESSAGE = 0xBADD,
SMSG_SELL_RESPONSE = 0xBADD,
SMSG_SELL_RESPONSE = 0x0933,
SMSG_SEND_ITEM_PASSIVES = 0xBADD,
SMSG_SEND_MAIL_RESULT = 0xBADD,
SMSG_SEND_RAID_TARGET_UPDATE_ALL = 0xBADD,