Merge branch 'azerothcore:master' into Playerbot

src/common/Collision/Management/IVMapMgr.h

@@ -37,6 +37,13 @@ namespace VMAP
         VMAP_LOAD_RESULT_IGNORED
     };
 
+    enum class LoadResult : uint8
+    {
+        Success,
+        FileNotFound,
+        VersionMismatch
+    };
+
     #define VMAP_INVALID_HEIGHT       -100000.0f            // for check
     #define VMAP_INVALID_HEIGHT_VALUE -200000.0f            // real assigned value in unknown height case
 
@@ -79,7 +86,7 @@ namespace VMAP
 
         virtual int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0;
 
-        virtual bool existsMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0;
+        virtual LoadResult existsMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0;
 
         virtual void unloadMap(unsigned int pMapId, int x, int y) = 0;
         virtual void unloadMap(unsigned int pMapId) = 0;

src/common/Collision/Management/VMapMgr2.cpp

@@ -379,7 +379,7 @@ namespace VMAP
         }
     }
 
-    bool VMapMgr2::existsMap(const char* basePath, unsigned int mapId, int x, int y)
+    LoadResult VMapMgr2::existsMap(const char* basePath, unsigned int mapId, int x, int y)
     {
         return StaticMapTree::CanLoadMap(std::string(basePath), mapId, x, y);
     }

src/common/Collision/Management/VMapMgr2.h

@@ -128,7 +128,7 @@ namespace VMAP
         {
             return getMapFileName(mapId);
         }
-        bool existsMap(const char* basePath, unsigned int mapId, int x, int y) override;
+        LoadResult existsMap(const char* basePath, unsigned int mapId, int x, int y) override;
         void GetInstanceMapTree(InstanceTreeMap& instanceMapTree);
 
         typedef uint32(*GetLiquidFlagsFn)(uint32 liquidType);