Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/PacketIO: Renamed a few packet classes to match client names

Browse Source
This commit is contained in:
Shauren
2014-11-15 13:03:32 +01:00
parent 5545a2605b
commit 4894991d55
5 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/game/Handlers/CharacterHandler.cpp
View File

@@ -227,7 +227,7 @@ bool LoginQueryHolder::Initialize()
void WorldSession::HandleCharEnum(PreparedQueryResult result)
{
WorldPackets::Character::CharEnumResult charEnum;
WorldPackets::Character::EnumCharactersResult charEnum;
charEnum.Success = true;
charEnum.IsDeletedCharacters = false;
@@ -238,7 +238,7 @@ void WorldSession::HandleCharEnum(PreparedQueryResult result)
do
{
Field* fields = result->Fetch();
WorldPackets::Character::CharEnumResult::CharacterInfo charInfo(fields);
WorldPackets::Character::EnumCharactersResult::CharacterInfo charInfo(fields);
TC_LOG_INFO("network", "Loading char guid %s from account %u.", charInfo.Guid.ToString().c_str(), GetAccountId());
@@ -257,7 +257,7 @@ void WorldSession::HandleCharEnum(PreparedQueryResult result)
SendPacket(charEnum.Write());
}
void WorldSession::HandleCharEnumOpcode(WorldPacket& /*recvData*/)
void WorldSession::HandleCharEnumOpcode(WorldPackets::Character::EnumCharacters& /*enumCharacters*/)
{
// remove expired bans
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_EXPIRED_BANS);
@@ -279,7 +279,7 @@ void WorldSession::HandleCharEnumOpcode(WorldPacket& /*recvData*/)
void WorldSession::HandleCharUndeleteEnum(PreparedQueryResult result)
{
WorldPackets::Character::CharEnumResult charEnum;
WorldPackets::Character::EnumCharactersResult charEnum;
charEnum.Success = true;
charEnum.IsDeletedCharacters = true;
@@ -288,7 +288,7 @@ void WorldSession::HandleCharUndeleteEnum(PreparedQueryResult result)
do
{
Field* fields = result->Fetch();
WorldPackets::Character::CharEnumResult::CharacterInfo charInfo(fields);
WorldPackets::Character::EnumCharactersResult::CharacterInfo charInfo(fields);
TC_LOG_INFO("network", "Loading undeleted char guid %s from account %u.", charInfo.Guid.ToString().c_str(), GetAccountId());
@@ -319,7 +319,7 @@ void WorldSession::HandleCharUndeleteEnumOpcode(WorldPacket& /*recvData*/)
_charEnumCallback.SetFutureResult(CharacterDatabase.AsyncQuery(stmt));
}
void WorldSession::HandleCharCreateOpcode(WorldPackets::Character::CharacterCreate& charCreate)
void WorldSession::HandleCharCreateOpcode(WorldPackets::Character::CreateChar& charCreate)
{
if (!HasPermission(rbac::RBAC_PERM_SKIP_CHECK_CHARACTER_CREATION_TEAMMASK))
{
@@ -687,7 +687,7 @@ void WorldSession::HandleCharCreateCallback(PreparedQueryResult result, WorldPac
}
}
void WorldSession::HandleCharDeleteOpcode(WorldPackets::Character::CharacterDelete& charDelete)
void WorldSession::HandleCharDeleteOpcode(WorldPackets::Character::DeleteChar& charDelete)
{
// Initiating
uint32 initAccountId = GetAccountId();

8
src/server/game/Server/Packets/CharacterPackets.cpp
View File

@@ -19,7 +19,7 @@
#include "ObjectMgr.h"
#include "World.h"
WorldPackets::Character::CharEnumResult::CharacterInfo::CharacterInfo(Field* fields)
WorldPackets::Character::EnumCharactersResult::CharacterInfo::CharacterInfo(Field* fields)
{
// 0 1 2 3 4 5 6 7
// "SELECT characters.guid, characters.name, characters.race, characters.class, characters.gender, characters.playerBytes, characters.playerBytes2, characters.level, "
@@ -124,7 +124,7 @@ WorldPackets::Character::CharEnumResult::CharacterInfo::CharacterInfo(Field* fie
}
}
WorldPacket const* WorldPackets::Character::CharEnumResult::Write()
WorldPacket const* WorldPackets::Character::EnumCharactersResult::Write()
{
_worldPacket.reserve(9 + Characters.size() * sizeof(CharacterInfo) + FactionChangeRestrictions.size() * sizeof(RestrictedFactionChangeRuleInfo));
@@ -184,7 +184,7 @@ WorldPacket const* WorldPackets::Character::CharEnumResult::Write()
return &_worldPacket;
}
void WorldPackets::Character::CharacterCreate::Read()
void WorldPackets::Character::CreateChar::Read()
{
CreateInfo.reset(new CharacterCreateInfo());
uint32 nameLength = _worldPacket.ReadBits(6);
@@ -209,7 +209,7 @@ WorldPacket const* WorldPackets::Character::CharacterCreateResponse::Write()
return &_worldPacket;
}
void WorldPackets::Character::CharacterDelete::Read()
void WorldPackets::Character::DeleteChar::Read()
{
_worldPacket >> Guid;
}

22
src/server/game/Server/Packets/CharacterPackets.h
View File

@@ -25,6 +25,14 @@ namespace WorldPackets
{
namespace Character
{
class EnumCharacters final : public ClientPacket
{
public:
EnumCharacters(WorldPacket&& packet) : ClientPacket(CMSG_CHAR_ENUM, std::move(packet)) { }
void Read() override { }
};
struct CharacterCreateInfo
{
/// User specified variables
@@ -86,13 +94,13 @@ namespace WorldPackets
std::string Name;
};
class CharEnumResult final : public ServerPacket
class EnumCharactersResult final : public ServerPacket
{
public:
struct CharacterInfo
{
/**
* @fn void WorldPackets::Character::CharEnumResult::CharacterInfo::CharacterInfo(Field* fields);
* @fn void WorldPackets::Character::EnumCharactersResult::CharacterInfo::CharacterInfo(Field* fields);
*
* @brief Initialize the struct with values from QueryResult
*
@@ -150,7 +158,7 @@ namespace WorldPackets
uint8 Race = 0;
};
CharEnumResult() : ServerPacket(SMSG_CHAR_ENUM) { }
EnumCharactersResult() : ServerPacket(SMSG_CHAR_ENUM) { }
WorldPacket const* Write() override;
@@ -161,10 +169,10 @@ namespace WorldPackets
std::list<RestrictedFactionChangeRuleInfo> FactionChangeRestrictions; ///< @todo: research
};
class CharacterCreate final : public ClientPacket
class CreateChar final : public ClientPacket
{
public:
CharacterCreate(WorldPacket&& packet) : ClientPacket(CMSG_CHAR_CREATE, std::move(packet)) { }
CreateChar(WorldPacket&& packet) : ClientPacket(CMSG_CHAR_CREATE, std::move(packet)) { }
void Read() override;
@@ -194,10 +202,10 @@ namespace WorldPackets
uint8 Code = 0; ///< Result code @see enum ResponseCodes
};
class CharacterDelete final : public ClientPacket
class DeleteChar final : public ClientPacket
{
public:
CharacterDelete(WorldPacket&& packet): ClientPacket(CMSG_CHAR_DELETE, std::move(packet)) { }
DeleteChar(WorldPacket&& packet): ClientPacket(CMSG_CHAR_DELETE, std::move(packet)) { }
void Read() override;

10
src/server/game/Server/Protocol/Opcodes.cpp
View File

@@ -225,12 +225,12 @@ void OpcodeTable::Initialize()
DEFINE_OPCODE_HANDLER_OLD(CMSG_CHANNEL_UNSILENCE_VOICE, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL );
DEFINE_OPCODE_HANDLER_OLD(CMSG_CHANNEL_VOICE_OFF, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleChannelVoiceOnOpcode );
DEFINE_OPCODE_HANDLER_OLD(CMSG_CHANNEL_VOICE_ON, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleChannelVoiceOnOpcode );
DEFINE_HANDLER(CMSG_CHAR_CREATE, STATUS_AUTHED, PROCESS_THREADUNSAFE, WorldPackets::Character::CharacterCreate, &WorldSession::HandleCharCreateOpcode);
DEFINE_HANDLER(CMSG_CHAR_CUSTOMIZE, STATUS_AUTHED, PROCESS_THREADUNSAFE, WorldPackets::Character::CharCustomize, &WorldSession::HandleCharCustomizeOpcode);
DEFINE_HANDLER(CMSG_CHAR_DELETE, STATUS_AUTHED, PROCESS_THREADUNSAFE, WorldPackets::Character::CharacterDelete, &WorldSession::HandleCharDeleteOpcode);
DEFINE_OPCODE_HANDLER_OLD(CMSG_CHAR_ENUM, STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleCharEnumOpcode );
DEFINE_HANDLER(CMSG_CHAR_CREATE, STATUS_AUTHED, PROCESS_THREADUNSAFE, WorldPackets::Character::CreateChar, &WorldSession::HandleCharCreateOpcode);
DEFINE_HANDLER(CMSG_CHAR_CUSTOMIZE, STATUS_AUTHED, PROCESS_THREADUNSAFE, WorldPackets::Character::CharCustomize, &WorldSession::HandleCharCustomizeOpcode);
DEFINE_HANDLER(CMSG_CHAR_DELETE, STATUS_AUTHED, PROCESS_THREADUNSAFE, WorldPackets::Character::DeleteChar, &WorldSession::HandleCharDeleteOpcode);
DEFINE_HANDLER(CMSG_CHAR_ENUM, STATUS_AUTHED, PROCESS_THREADUNSAFE, WorldPackets::Character::EnumCharacters, &WorldSession::HandleCharEnumOpcode );
DEFINE_HANDLER(CMSG_CHAR_RACE_OR_FACTION_CHANGE, STATUS_AUTHED, PROCESS_THREADUNSAFE, WorldPackets::Character::CharRaceOrFactionChange, &WorldSession::HandleCharRaceOrFactionChangeOpcode);
DEFINE_HANDLER(CMSG_CHAR_RENAME, STATUS_AUTHED, PROCESS_THREADUNSAFE, WorldPackets::Character::CharacterRenameRequest, &WorldSession::HandleCharRenameOpcode);
DEFINE_HANDLER(CMSG_CHAR_RENAME, STATUS_AUTHED, PROCESS_THREADUNSAFE, WorldPackets::Character::CharacterRenameRequest, &WorldSession::HandleCharRenameOpcode);
DEFINE_OPCODE_HANDLER_OLD(CMSG_CHAR_UNDELETE_ENUM, STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleCharUndeleteEnumOpcode );
DEFINE_OPCODE_HANDLER_OLD(CMSG_CHAT_FILTERED, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL );
DEFINE_OPCODE_HANDLER_OLD(CMSG_CHAT_IGNORED, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleChatIgnoredOpcode );

11
src/server/game/Server/WorldSession.h
View File

@@ -81,8 +81,9 @@ namespace WorldPackets
struct CharRaceOrFactionChangeInfo;
struct CharacterUndeleteInfo;
class CharacterCreate;
class CharacterDelete;
class EnumCharacters;
class CreateChar;
class DeleteChar;
class CharacterRenameRequest;
class CharCustomize;
class CharRaceOrFactionChange;
@@ -458,11 +459,11 @@ class WorldSession
void Handle_Deprecated(WorldPacket& recvPacket); // never used anymore by client
void HandleCharEnum(PreparedQueryResult result);
void HandleCharEnumOpcode(WorldPacket& /*recvData*/);
void HandleCharEnumOpcode(WorldPackets::Character::EnumCharacters& /*enumCharacters*/);
void HandleCharUndeleteEnum(PreparedQueryResult result);
void HandleCharUndeleteEnumOpcode(WorldPacket& /*recvData*/);
void HandleCharDeleteOpcode(WorldPackets::Character::CharacterDelete& charDelete);
void HandleCharCreateOpcode(WorldPackets::Character::CharacterCreate& charCreate);
void HandleCharDeleteOpcode(WorldPackets::Character::DeleteChar& charDelete);
void HandleCharCreateOpcode(WorldPackets::Character::CreateChar& charCreate);
void HandleCharCreateCallback(PreparedQueryResult result, WorldPackets::Character::CharacterCreateInfo* createInfo);
void HandlePlayerLoginOpcode(WorldPackets::Character::PlayerLogin& playerLogin);
void HandleContinuePlayerLogin();