From cbb00b9cb393e68255ec96fd348e38aae897c0fe Mon Sep 17 00:00:00 2001 From: karashiiro <49822414+karashiiro@users.noreply.github.com> Date: Thu, 10 Oct 2019 14:47:35 -0700 Subject: [PATCH] MarketCity enum --- src/common/Common.h | 10 ++++++++++ src/common/Network/PacketDef/Zone/ServerZoneDef.h | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/common/Common.h b/src/common/Common.h index 7bb57000..21e6ba60 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -993,6 +993,16 @@ namespace Sapphire::Common CircularAoEPlaced = 7 }; + enum MarketCity : uint8_t + { + LimsaLominsa = 1, + Gridania = 2, + Uldah = 3, + Ishgard = 4, + Kugane = 7, + Crystarium = 10 + } + enum class Role : uint8_t { None, diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index 8812e17f..fe376702 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -322,15 +322,7 @@ namespace Sapphire::Network::Packets::Server bool hq; uint8_t materiaCount; uint8_t onMannequin; - /** - * 0x01 Limsa Lominsa - * 0x02 Gridania - * 0x03 Ul'dah - * 0x04 Ishgard - * 0x07 Kugane - * 0x0A Crystarium - */ - uint8_t retainerCity; + Common::MarketCity marketCity; uint16_t dyeId; uint16_t padding3; uint32_t padding4;