diff --git a/src/common/Common.h b/src/common/Common.h index 2f912b29..7bb57000 100644 --- a/src/common/Common.h +++ b/src/common/Common.h @@ -993,16 +993,6 @@ namespace Sapphire::Common CircularAoEPlaced = 7 }; - enum City : 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/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h index bc728cbe..7b0d39ea 100644 --- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h @@ -40,9 +40,9 @@ struct FFXIVIpcClientTrigger : /* 0004 */ uint32_t param11; /* 0008 */ uint32_t param12; /* 000C */ uint32_t param2; - /* 0010 */ uint32_t param3; - /* 0014 */ uint32_t param4; - /* 0018 */ uint64_t param5; + /* 0010 */ uint32_t param4; // todo: really? + /* 0014 */ uint32_t param5; + /* 0018 */ uint64_t param3; }; struct FFXIVIpcUpdatePosition : diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index d7dd9a04..3b4de057 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -322,7 +322,7 @@ namespace Sapphire::Network::Packets::Server bool hq; uint8_t materiaCount; uint8_t onMannequin; - Common::City marketCity; + Common::Town marketCity; uint16_t dyeId; uint16_t padding3; uint32_t padding4;