From a0e758f5b7fa47d4ee93f634ae0f40f93a2dcd00 Mon Sep 17 00:00:00 2001
From: gsemaj <gentsemaj@live.com>
Date: Sat, 1 May 2021 11:06:48 -0400
Subject: [PATCH] [refac] Move WarpLocation to Transport.hpp

---
 src/NPCManager.hpp | 6 ++----
 src/Transport.hpp  | 5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/NPCManager.hpp b/src/NPCManager.hpp
index 9c245a1..8a4ff62 100644
--- a/src/NPCManager.hpp
+++ b/src/NPCManager.hpp
@@ -3,6 +3,7 @@
 #include "core/Core.hpp"
 #include "PlayerManager.hpp"
 #include "NPC.hpp"
+#include "Transport.hpp"
 
 #include "JSON.hpp"
 
@@ -28,10 +29,7 @@ struct NPCEvent {
         : npcType(t), trigger(tr), handler(hndlr) {}
 };
 
-// this should really be called vec3 or something...
-struct WarpLocation {
-    int x, y, z, instanceID, isInstance, limitTaskID, npcID;
-};
+struct WarpLocation;
 
 namespace NPCManager {
     extern std::unordered_map<int32_t, BaseNPC*> NPCs;
diff --git a/src/Transport.hpp b/src/Transport.hpp
index dca36b6..0a05959 100644
--- a/src/Transport.hpp
+++ b/src/Transport.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "servers/CNShardServer.hpp"
-#include "NPCManager.hpp"
 
 #include <unordered_map>
 
@@ -9,7 +8,9 @@ const int SLIDER_SPEED = 1200;
 const int SLIDER_STOP_TICKS = 16;
 const int SLIDER_GAP_SIZE = 45000;
 
-struct WarpLocation;
+struct WarpLocation {
+    int x, y, z, instanceID, isInstance, limitTaskID, npcID;
+};
 
 struct TransportRoute {
     int type, start, end, cost, mssSpeed, mssRouteNum;