From 61edc8248b8243a1cf076c1191e5dd03ad26e766 Mon Sep 17 00:00:00 2001 From: Mordred Date: Fri, 9 Nov 2018 21:36:40 +0100 Subject: [PATCH] Actually send gc information, too --- src/common/CommonGen.h | 8 +++----- .../sapphire_zone/Network/Handlers/PacketHandlers.cpp | 9 +++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/common/CommonGen.h b/src/common/CommonGen.h index dc99925d..63988bbc 100644 --- a/src/common/CommonGen.h +++ b/src/common/CommonGen.h @@ -148,10 +148,9 @@ enum class ExVersion : /////////////////////////////////////////////////////////// //GrandCompany.exd -enum class GrandCompany : - uint8_t +enum GrandCompany : uint8_t { - None = 0, + NoGc = 0, Maelstrom = 1, OrderoftheTwinAdder = 2, ImmortalFlames = 3, @@ -159,8 +158,7 @@ enum class GrandCompany : /////////////////////////////////////////////////////////// //GuardianDeity.exd -enum class GuardianDeity : - uint8_t +enum class GuardianDeity : uint8_t { HalonetheFury = 1, MenphinatheLover = 2, diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp index c61c7730..80ee5f85 100644 --- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp @@ -434,6 +434,15 @@ void Core::Network::GameConnection::finishLoadingHandler( const Core::Network::P Entity::Player& player ) { player.sendQuestInfo(); + + // TODO: load and save this data instead of hardcoding + auto gcPacket = makeZonePacket< FFXIVGCAffiliation >( player.getId() ); + gcPacket->data().gcId = player.getGc(); + gcPacket->data().gcRank[ 0 ] = player.getGcRankArray()[ 0 ]; + gcPacket->data().gcRank[ 1 ] = player.getGcRankArray()[ 1 ]; + gcPacket->data().gcRank[ 2 ] = player.getGcRankArray()[ 2 ]; + player.queuePacket( gcPacket ); + player.getCurrentZone()->onFinishLoading( player ); // player is done zoning