aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Server/Packet.h2
-rw-r--r--src/server/game/Server/Packets/AuthenticationPackets.h4
-rw-r--r--src/server/game/Server/Packets/CharacterPackets.cpp54
-rw-r--r--src/server/game/Server/Packets/CharacterPackets.h28
-rw-r--r--src/server/game/Server/Packets/GuildPackets.cpp6
-rw-r--r--src/server/game/Server/Packets/GuildPackets.h2
6 files changed, 18 insertions, 78 deletions
diff --git a/src/server/game/Server/Packet.h b/src/server/game/Server/Packet.h
index 1a2ba87f90a..6c8216f6812 100644
--- a/src/server/game/Server/Packet.h
+++ b/src/server/game/Server/Packet.h
@@ -59,7 +59,7 @@ namespace WorldPackets
class ClientPacket : public Packet
{
public:
- ClientPacket(WorldPacket&& packet) : Packet(std::move(packet)) { }
+ ClientPacket(OpcodeClient expectedOpcode, WorldPacket&& packet) : Packet(std::move(packet)) { ASSERT(packet.GetOpcode() == expectedOpcode); }
WorldPacket const* Write() override final
{
diff --git a/src/server/game/Server/Packets/AuthenticationPackets.h b/src/server/game/Server/Packets/AuthenticationPackets.h
index 6f9eae12f63..e24c06396e0 100644
--- a/src/server/game/Server/Packets/AuthenticationPackets.h
+++ b/src/server/game/Server/Packets/AuthenticationPackets.h
@@ -46,7 +46,7 @@ namespace WorldPackets
class AuthSession final : public ClientPacket
{
public:
- AuthSession(WorldPacket&& packet) : ClientPacket(std::move(packet))
+ AuthSession(WorldPacket&& packet) : ClientPacket(CMSG_AUTH_SESSION, std::move(packet))
{
memset(Digest, 0, SHA_DIGEST_LENGTH);
}
@@ -172,7 +172,7 @@ namespace WorldPackets
class AuthContinuedSession final : public ClientPacket
{
public:
- AuthContinuedSession(WorldPacket&& packet) : ClientPacket(std::move(packet))
+ AuthContinuedSession(WorldPacket&& packet) : ClientPacket(CMSG_AUTH_CONTINUED_SESSION, std::move(packet))
{
memset(Digest, 0, SHA_DIGEST_LENGTH);
}
diff --git a/src/server/game/Server/Packets/CharacterPackets.cpp b/src/server/game/Server/Packets/CharacterPackets.cpp
index 70da43ff661..9f5aa56aedd 100644
--- a/src/server/game/Server/Packets/CharacterPackets.cpp
+++ b/src/server/game/Server/Packets/CharacterPackets.cpp
@@ -124,9 +124,6 @@ WorldPackets::Character::CharEnumResult::CharacterInfo::CharacterInfo(Field* fie
}
}
-WorldPackets::Character::CharEnumResult::CharEnumResult()
- : ServerPacket(SMSG_CHAR_ENUM) { }
-
WorldPacket const* WorldPackets::Character::CharEnumResult::Write()
{
_worldPacket.reserve(9 + Characters.size() * sizeof(CharacterInfo) + FactionChangeRestrictions.size() * sizeof(RestrictedFactionChangeRuleInfo));
@@ -187,12 +184,6 @@ WorldPacket const* WorldPackets::Character::CharEnumResult::Write()
return &_worldPacket;
}
-WorldPackets::Character::CharacterCreate::CharacterCreate(WorldPacket&& packet)
- : ClientPacket(std::move(packet))
-{
- ASSERT(_worldPacket.GetOpcode() == CMSG_CHAR_CREATE);
-}
-
void WorldPackets::Character::CharacterCreate::Read()
{
CreateInfo.reset(new CharacterCreateInfo());
@@ -212,50 +203,29 @@ void WorldPackets::Character::CharacterCreate::Read()
_worldPacket >> CreateInfo->TemplateSet.value;
}
-WorldPackets::Character::CharacterCreateResponse::CharacterCreateResponse()
- : ServerPacket(SMSG_CHAR_CREATE, 1) { }
-
WorldPacket const* WorldPackets::Character::CharacterCreateResponse::Write()
{
_worldPacket << uint8(Code);
return &_worldPacket;
}
-WorldPackets::Character::CharacterDelete::CharacterDelete(WorldPacket&& packet)
- : ClientPacket(std::move(packet))
-{
- ASSERT(_worldPacket.GetOpcode() == CMSG_CHAR_DELETE);
-}
-
void WorldPackets::Character::CharacterDelete::Read()
{
_worldPacket >> Guid;
}
-WorldPackets::Character::CharacterDeleteResponse::CharacterDeleteResponse()
- : ServerPacket(SMSG_CHAR_DELETE, 1) { }
-
WorldPacket const* WorldPackets::Character::CharacterDeleteResponse::Write()
{
_worldPacket << uint8(Code);
return &_worldPacket;
}
-WorldPackets::Character::GenerateRandomCharacterName::GenerateRandomCharacterName(WorldPacket&& packet)
- : ClientPacket(std::move(packet))
-{
- ASSERT(_worldPacket.GetOpcode() == CMSG_RANDOMIZE_CHAR_NAME);
-}
-
void WorldPackets::Character::GenerateRandomCharacterName::Read()
{
_worldPacket >> Race;
_worldPacket >> Sex;
}
-WorldPackets::Character::GenerateRandomCharacterNameResult::GenerateRandomCharacterNameResult()
- : ServerPacket(SMSG_RANDOMIZE_CHAR_NAME, 20) { }
-
WorldPacket const* WorldPackets::Character::GenerateRandomCharacterNameResult::Write()
{
_worldPacket.WriteBit(Success);
@@ -264,12 +234,6 @@ WorldPacket const* WorldPackets::Character::GenerateRandomCharacterNameResult::W
return &_worldPacket;
}
-WorldPackets::Character::ReorderCharacters::ReorderCharacters(WorldPacket&& packet)
- : ClientPacket(std::move(packet))
-{
- ASSERT(_worldPacket.GetOpcode() == CMSG_REORDER_CHARACTERS);
-}
-
void WorldPackets::Character::ReorderCharacters::Read()
{
uint32 count = std::min<uint32>(_worldPacket.ReadBits(9), sWorld->getIntConfig(CONFIG_CHARACTERS_PER_REALM));
@@ -282,12 +246,6 @@ void WorldPackets::Character::ReorderCharacters::Read()
}
}
-WorldPackets::Character::UndeleteCharacter::UndeleteCharacter(WorldPacket&& packet)
- : ClientPacket(std::move(packet))
-{
- ASSERT(_worldPacket.GetOpcode() == CMSG_UNDELETE_CHARACTER);
-}
-
void WorldPackets::Character::UndeleteCharacter::Read()
{
UndeleteInfo.reset(new CharacterUndeleteInfo());
@@ -295,9 +253,6 @@ void WorldPackets::Character::UndeleteCharacter::Read()
_worldPacket >> UndeleteInfo->CharacterGuid;
}
-WorldPackets::Character::UndeleteCharacterResponse::UndeleteCharacterResponse()
- : ServerPacket(SMSG_UNDELETE_CHARACTER_RESPONSE, 26) { }
-
WorldPacket const* WorldPackets::Character::UndeleteCharacterResponse::Write()
{
ASSERT(UndeleteInfo);
@@ -307,9 +262,6 @@ WorldPacket const* WorldPackets::Character::UndeleteCharacterResponse::Write()
return &_worldPacket;
}
-WorldPackets::Character::UndeleteCooldownStatusResponse::UndeleteCooldownStatusResponse()
- : ServerPacket(SMSG_UNDELETE_COOLDOWN_STATUS_RESPONSE, 9) { }
-
WorldPacket const* WorldPackets::Character::UndeleteCooldownStatusResponse::Write()
{
_worldPacket.WriteBit(OnCooldown);
@@ -318,12 +270,6 @@ WorldPacket const* WorldPackets::Character::UndeleteCooldownStatusResponse::Writ
return &_worldPacket;
}
-WorldPackets::Character::PlayerLogin::PlayerLogin(WorldPacket&& packet)
- : ClientPacket(std::move(packet))
-{
- ASSERT(_worldPacket.GetOpcode() == CMSG_PLAYER_LOGIN);
-}
-
void WorldPackets::Character::PlayerLogin::Read()
{
_worldPacket >> Guid;
diff --git a/src/server/game/Server/Packets/CharacterPackets.h b/src/server/game/Server/Packets/CharacterPackets.h
index a4bb21cd9b0..184c9b42cb7 100644
--- a/src/server/game/Server/Packets/CharacterPackets.h
+++ b/src/server/game/Server/Packets/CharacterPackets.h
@@ -139,7 +139,7 @@ namespace WorldPackets
uint8 Race = 0;
};
- CharEnumResult();
+ CharEnumResult() : ServerPacket(SMSG_CHAR_ENUM) { }
WorldPacket const* Write() override;
@@ -153,7 +153,7 @@ namespace WorldPackets
class CharacterCreate final : public ClientPacket
{
public:
- CharacterCreate(WorldPacket&& packet);
+ CharacterCreate(WorldPacket&& packet) : ClientPacket(CMSG_CHAR_CREATE, std::move(packet)) { }
void Read() override;
@@ -176,7 +176,7 @@ namespace WorldPackets
class CharacterCreateResponse final : public ServerPacket
{
public:
- CharacterCreateResponse();
+ CharacterCreateResponse() : ServerPacket(SMSG_CHAR_CREATE, 1) { }
WorldPacket const* Write() override;
@@ -186,7 +186,7 @@ namespace WorldPackets
class CharacterDelete final : public ClientPacket
{
public:
- CharacterDelete(WorldPacket&& packet);
+ CharacterDelete(WorldPacket&& packet): ClientPacket(CMSG_CHAR_DELETE, std::move(packet)) { }
void Read() override;
@@ -196,7 +196,7 @@ namespace WorldPackets
class CharacterDeleteResponse final : public ServerPacket
{
public:
- CharacterDeleteResponse();
+ CharacterDeleteResponse(): ServerPacket(SMSG_CHAR_DELETE, 1) { }
WorldPacket const* Write() override;
@@ -206,7 +206,7 @@ namespace WorldPackets
class GenerateRandomCharacterName final : public ClientPacket
{
public:
- GenerateRandomCharacterName(WorldPacket&& packet);
+ GenerateRandomCharacterName(WorldPacket&& packet) : ClientPacket(CMSG_RANDOMIZE_CHAR_NAME, std::move(packet)) { }
void Read() override;
@@ -217,7 +217,7 @@ namespace WorldPackets
class GenerateRandomCharacterNameResult final : public ServerPacket
{
public:
- GenerateRandomCharacterNameResult();
+ GenerateRandomCharacterNameResult(): ServerPacket(SMSG_RANDOMIZE_CHAR_NAME, 20) { }
WorldPacket const* Write() override;
@@ -234,7 +234,7 @@ namespace WorldPackets
uint8 NewPosition = 0;
};
- ReorderCharacters(WorldPacket&& packet);
+ ReorderCharacters(WorldPacket&& packet) : ClientPacket(CMSG_REORDER_CHARACTERS, std::move(packet)) { }
void Read() override;
@@ -244,7 +244,7 @@ namespace WorldPackets
class UndeleteCharacter final : public ClientPacket
{
public:
- UndeleteCharacter(WorldPacket&& packet);
+ UndeleteCharacter(WorldPacket&& packet) : ClientPacket(CMSG_UNDELETE_CHARACTER, std::move(packet)) { }
void Read() override;
@@ -258,7 +258,7 @@ namespace WorldPackets
class UndeleteCharacterResponse final : public ServerPacket
{
public:
- UndeleteCharacterResponse();
+ UndeleteCharacterResponse() : ServerPacket(SMSG_UNDELETE_CHARACTER_RESPONSE, 26) { }
WorldPacket const* Write() override;
@@ -273,7 +273,7 @@ namespace WorldPackets
class UndeleteCooldownStatusResponse final : public ServerPacket
{
public:
- UndeleteCooldownStatusResponse();
+ UndeleteCooldownStatusResponse() : ServerPacket(SMSG_UNDELETE_COOLDOWN_STATUS_RESPONSE, 9) { }
WorldPacket const* Write() override;
@@ -285,7 +285,7 @@ namespace WorldPackets
class PlayerLogin final : public ClientPacket
{
public:
- PlayerLogin(WorldPacket&& packet);
+ PlayerLogin(WorldPacket&& packet) : ClientPacket(CMSG_PLAYER_LOGIN, std::move(packet)) { }
void Read() override;
@@ -308,7 +308,7 @@ namespace WorldPackets
class LogoutRequest final : public ClientPacket
{
public:
- LogoutRequest(WorldPacket&& packet) : ClientPacket(std::move(packet)) { }
+ LogoutRequest(WorldPacket&& packet) : ClientPacket(CMSG_LOGOUT_REQUEST, std::move(packet)) { }
void Read() override { }
};
@@ -337,7 +337,7 @@ namespace WorldPackets
class LogoutCancel final : public ClientPacket
{
public:
- LogoutCancel(WorldPacket&& packet) : ClientPacket(std::move(packet)) { }
+ LogoutCancel(WorldPacket&& packet) : ClientPacket(CMSG_LOGOUT_CANCEL, std::move(packet)) { }
void Read() override { }
};
diff --git a/src/server/game/Server/Packets/GuildPackets.cpp b/src/server/game/Server/Packets/GuildPackets.cpp
index b94fb7839bf..c853cf4cc19 100644
--- a/src/server/game/Server/Packets/GuildPackets.cpp
+++ b/src/server/game/Server/Packets/GuildPackets.cpp
@@ -17,12 +17,6 @@
#include "GuildPackets.h"
-WorldPackets::Guild::QueryGuildInfo::QueryGuildInfo(WorldPacket&& packet)
- : ClientPacket(std::move(packet))
-{
- ASSERT(_worldPacket.GetOpcode() == CMSG_GUILD_QUERY);
-}
-
void WorldPackets::Guild::QueryGuildInfo::Read()
{
_worldPacket >> GuildGuid;
diff --git a/src/server/game/Server/Packets/GuildPackets.h b/src/server/game/Server/Packets/GuildPackets.h
index 479ceba6280..ea308aa9a88 100644
--- a/src/server/game/Server/Packets/GuildPackets.h
+++ b/src/server/game/Server/Packets/GuildPackets.h
@@ -28,7 +28,7 @@ namespace WorldPackets
class QueryGuildInfo final : public ClientPacket
{
public:
- QueryGuildInfo(WorldPacket&& packet);
+ QueryGuildInfo(WorldPacket&& packet) : ClientPacket(CMSG_GUILD_QUERY, std::move(packet)) { }
void Read() override;