Merge pull request #14377 from DJScias/opcodes4

Core/Packets: update and enable SMSG_SUPPRESS_NPC_GREETINGS
This commit is contained in:
Duarte Duarte
2015-03-15 13:16:46 +00:00
3 changed files with 22 additions and 1 deletions
@@ -134,9 +134,19 @@ void WorldPackets::NPC::GossipSelectOption::Read()
uint32 length = _worldPacket.ReadBits(8);
PromotionCode = _worldPacket.ReadString(length);
}
WorldPacket const* WorldPackets::NPC::PlayerTabardVendorActivate::Write()
{
_worldPacket << Vendor;
return &_worldPacket;
}
WorldPacket const* WorldPackets::NPC::SuppressNPCGreetings::Write()
{
_worldPacket << UnitGUID;
_worldPacket.WriteBit(SuppressNPCGreeting);
_worldPacket.FlushBits();
return &_worldPacket;
}
@@ -168,6 +168,17 @@ namespace WorldPackets
ObjectGuid Vendor;
};
class SuppressNPCGreetings final : public ServerPacket
{
public:
SuppressNPCGreetings() : ServerPacket(SMSG_SUPPRESS_NPC_GREETINGS, 16 + 1) { }
WorldPacket const* Write() override;
ObjectGuid UnitGUID;
bool SuppressNPCGreeting = false;
};
}
}
+1 -1
View File
@@ -1801,7 +1801,7 @@ void OpcodeTable::Initialize()
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SUMMON_RAID_MEMBER_VALIDATE_FAILED, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SUMMON_REQUEST, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SUPERCEDED_SPELL, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SUPPRESS_NPC_GREETINGS, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SUPPRESS_NPC_GREETINGS, STATUS_NEVER, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SUSPEND_COMMS, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_SUSPEND_TOKEN, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_TABARD_VENDOR_ACTIVATE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);