From 4ae5d6120dc35a25a5b3848473f3c1fbc0d6ed9a Mon Sep 17 00:00:00 2001
From: pmgr <26606291+pmgr@users.noreply.github.com>
Date: Sun, 21 Jun 2020 01:26:54 +0100
Subject: [PATCH] Convert markerId in FFXIVIpcPlaceFieldMarker into an enum

---
 src/common/Common.h                               | 12 ++++++++++++
 src/common/Network/PacketDef/Zone/ServerZoneDef.h |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 14be767a..9c3b9bd3 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -577,6 +577,18 @@ namespace Sapphire::Common
     Three = 0x40,
     Four = 0x80
   };
+  // TODO: consolidate these two into one since FieldMarkerStatus == 1 << FieldMarkerId?
+  enum class FieldMarkerId : uint8_t
+  {
+    A,
+    B,
+    C,
+    D,
+    One,
+    Two,
+    Three,
+    Four
+  };
 
   enum struct ActionAspect : uint8_t
   {
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 6da042a6..a60dad20 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1701,7 +1701,7 @@ namespace Sapphire::Network::Packets::Server
    */
   struct FFXIVIpcPlaceFieldMarker : FFXIVIpcBasePacket< PlaceFieldMarker >
   {
-    uint8_t markerId;
+    Common::FieldMarkerId markerId;
     uint8_t status;
     uint8_t pad[2];
     uint32_t Xint;