From 78a996cb8f4118c60ee22248c9cf2626c6f6f910 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 28 Dec 2022 14:45:00 +0800
Subject: [PATCH] 1

---
 server/gameserver/mapinstance.cc | 8 ++++----
 server/gameserver/mapinstance.h  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/gameserver/mapinstance.cc b/server/gameserver/mapinstance.cc
index 70192c67..dd36d6a4 100644
--- a/server/gameserver/mapinstance.cc
+++ b/server/gameserver/mapinstance.cc
@@ -252,9 +252,9 @@ int MapInstance::AllocUniid()
 }
 
 int MapInstance::FindStraightPath(int layer,
-                                  const a8::Vec3& start,
-                                  const a8::Vec3& end,
-                                  std::vector<a8::Vec3>& paths)
+                                  const glm::vec3& start,
+                                  const glm::vec3& end,
+                                  std::vector<glm::vec3>& paths)
 {
     float spos[3];
     spos[0] = start.x;
@@ -321,7 +321,7 @@ int MapInstance::FindStraightPath(int layer,
                                          &nstraightPath,
                                          MAX_POLYS);
         for(int i = 0; i < nstraightPath * 3; ) {
-            a8::Vec3 currpos;
+            glm::vec3 currpos;
             currpos.x = straightPath[i++];
             currpos.y = straightPath[i++];
             currpos.z = straightPath[i++];
diff --git a/server/gameserver/mapinstance.h b/server/gameserver/mapinstance.h
index c6cb2887..80becca9 100644
--- a/server/gameserver/mapinstance.h
+++ b/server/gameserver/mapinstance.h
@@ -26,9 +26,9 @@ class MapInstance : public std::enable_shared_from_this<MapInstance>
     dtNavMesh* GetNavMesh() { return navmesh_; };
     dtNavMeshQuery* GetNavMeshQuery() { return navmesh_query_; };
     int FindStraightPath(int layer,
-                         const a8::Vec3& start,
-                         const a8::Vec3& end,
-                         std::vector<a8::Vec3>& paths);
+                         const glm::vec3& start,
+                         const glm::vec3& end,
+                         std::vector<glm::vec3>& paths);
     int FindRandomPointAroundCircle(int layer,
                                     const glm::vec3& center_pos,
                                     float max_radius,