diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-01-22 12:06:02 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2018-12-09 14:18:42 +0100 |
| commit | 217a9bb34ddfde128df1567877cbef7df8729c28 (patch) | |
| tree | 1b58a647d7b2f76bdbc4777b19121559ec977619 /src/common/Collision/Management | |
| parent | 63fa69d39fea93b96337f0aff441ea1867436c1c (diff) | |
Core/Vmaps: Changed error message when loading outdated vmaps
Closes #18431
Closes #18857
(cherry-picked from c90882ed6e2aba3b2d421abdc17cb57bea61d04b)
Diffstat (limited to 'src/common/Collision/Management')
| -rw-r--r-- | src/common/Collision/Management/IVMapManager.h | 9 | ||||
| -rw-r--r-- | src/common/Collision/Management/VMapManager2.cpp | 2 | ||||
| -rw-r--r-- | src/common/Collision/Management/VMapManager2.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h index d876136fe10..d8073e86b78 100644 --- a/src/common/Collision/Management/IVMapManager.h +++ b/src/common/Collision/Management/IVMapManager.h @@ -39,6 +39,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 @@ -56,7 +63,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; diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index 1f3e001b054..0ad872fe6c1 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -351,7 +351,7 @@ namespace VMAP } } - bool VMapManager2::existsMap(const char* basePath, unsigned int mapId, int x, int y) + LoadResult VMapManager2::existsMap(const char* basePath, unsigned int mapId, int x, int y) { return StaticMapTree::CanLoadMap(std::string(basePath), mapId, x, y, this); } diff --git a/src/common/Collision/Management/VMapManager2.h b/src/common/Collision/Management/VMapManager2.h index 32a4ec17e32..c48a8e985a6 100644 --- a/src/common/Collision/Management/VMapManager2.h +++ b/src/common/Collision/Management/VMapManager2.h @@ -131,7 +131,7 @@ namespace VMAP { return getMapFileName(mapId); } - virtual bool existsMap(const char* basePath, unsigned int mapId, int x, int y) override; + virtual LoadResult existsMap(const char* basePath, unsigned int mapId, int x, int y) override; void getInstanceMapTree(InstanceTreeMap &instanceMapTree); |
