Skip to content

Commit bdceccd

Browse files
committed
Core/Misc: Remove outdated TODO comment
1 parent a3d50e0 commit bdceccd

File tree

2 files changed

+55
-57
lines changed

2 files changed

+55
-57
lines changed

src/server/game/Server/Packets/CharacterPackets.cpp

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,38 @@ void CharCustomize::Read()
544544
SortCustomizations(CustomizeInfo->Customizations);
545545
}
546546

547+
CharCustomizeSuccess::CharCustomizeSuccess(CharCustomizeInfo const* info)
548+
: ServerPacket(SMSG_CHAR_CUSTOMIZE_SUCCESS, 16 + 1 + 1 + 1 + 1 + 1 + 1 + 1), Customizations(info->Customizations)
549+
{
550+
CharGUID = info->CharGUID;
551+
SexID = info->SexID;
552+
CharName = info->CharName;
553+
}
554+
555+
WorldPacket const* CharCustomizeSuccess::Write()
556+
{
557+
_worldPacket << CharGUID;
558+
_worldPacket << uint8(SexID);
559+
_worldPacket << Size<uint32>(Customizations);
560+
for (ChrCustomizationChoice customization : Customizations)
561+
_worldPacket << customization;
562+
563+
_worldPacket << SizedString::BitsSize<6>(CharName);
564+
_worldPacket.FlushBits();
565+
566+
_worldPacket << SizedString::Data(CharName);
567+
568+
return &_worldPacket;
569+
}
570+
571+
WorldPacket const* CharCustomizeFailure::Write()
572+
{
573+
_worldPacket << uint32(Result);
574+
_worldPacket << CharGUID;
575+
576+
return &_worldPacket;
577+
}
578+
547579
void CharRaceOrFactionChange::Read()
548580
{
549581
RaceOrFactionChangeInfo = std::make_shared<CharRaceOrFactionChangeInfo>();
@@ -826,38 +858,6 @@ WorldPacket const* SetFactionVisible::Write()
826858
return &_worldPacket;
827859
}
828860

829-
CharCustomizeSuccess::CharCustomizeSuccess(CharCustomizeInfo const* info)
830-
: ServerPacket(SMSG_CHAR_CUSTOMIZE_SUCCESS, 16 + 1 + 1 + 1 + 1 + 1 + 1 + 1), Customizations(info->Customizations)
831-
{
832-
CharGUID = info->CharGUID;
833-
SexID = info->SexID;
834-
CharName = info->CharName;
835-
}
836-
837-
WorldPacket const* CharCustomizeSuccess::Write()
838-
{
839-
_worldPacket << CharGUID;
840-
_worldPacket << uint8(SexID);
841-
_worldPacket << Size<uint32>(Customizations);
842-
for (ChrCustomizationChoice customization : Customizations)
843-
_worldPacket << customization;
844-
845-
_worldPacket << SizedString::BitsSize<6>(CharName);
846-
_worldPacket.FlushBits();
847-
848-
_worldPacket << SizedString::Data(CharName);
849-
850-
return &_worldPacket;
851-
}
852-
853-
WorldPacket const* CharCustomizeFailure::Write()
854-
{
855-
_worldPacket << uint32(Result);
856-
_worldPacket << CharGUID;
857-
858-
return &_worldPacket;
859-
}
860-
861861
void SetPlayerDeclinedNames::Read()
862862
{
863863
_worldPacket >> Player;

src/server/game/Server/Packets/CharacterPackets.h

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,29 @@ namespace WorldPackets
417417
std::shared_ptr<CharCustomizeInfo> CustomizeInfo;
418418
};
419419

420-
/// @todo: CharCustomizeResult
420+
class CharCustomizeSuccess final : public ServerPacket
421+
{
422+
public:
423+
explicit CharCustomizeSuccess(CharCustomizeInfo const* customizeInfo);
424+
425+
WorldPacket const* Write() override;
426+
427+
ObjectGuid CharGUID;
428+
std::string CharName;
429+
uint8 SexID = 0;
430+
Array<ChrCustomizationChoice, 250> const& Customizations;
431+
};
432+
433+
class CharCustomizeFailure final : public ServerPacket
434+
{
435+
public:
436+
explicit CharCustomizeFailure() : ServerPacket(SMSG_CHAR_CUSTOMIZE_FAILURE, 1 + 16) { }
437+
438+
WorldPacket const* Write() override;
439+
440+
uint32 Result = 0;
441+
ObjectGuid CharGUID;
442+
};
421443

422444
class CharRaceOrFactionChange final : public ClientPacket
423445
{
@@ -839,30 +861,6 @@ namespace WorldPackets
839861
uint32 FactionIndex = 0;
840862
};
841863

842-
class CharCustomizeSuccess final : public ServerPacket
843-
{
844-
public:
845-
explicit CharCustomizeSuccess(CharCustomizeInfo const* customizeInfo);
846-
847-
WorldPacket const* Write() override;
848-
849-
ObjectGuid CharGUID;
850-
std::string CharName;
851-
uint8 SexID = 0;
852-
Array<ChrCustomizationChoice, 250> const& Customizations;
853-
};
854-
855-
class CharCustomizeFailure final : public ServerPacket
856-
{
857-
public:
858-
explicit CharCustomizeFailure() : ServerPacket(SMSG_CHAR_CUSTOMIZE_FAILURE, 1 + 16) { }
859-
860-
WorldPacket const* Write() override;
861-
862-
uint32 Result = 0;
863-
ObjectGuid CharGUID;
864-
};
865-
866864
class SetPlayerDeclinedNames final : public ClientPacket
867865
{
868866
public:

0 commit comments

Comments
 (0)