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/Maps/MapTree.h | |
| 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/Maps/MapTree.h')
| -rw-r--r-- | src/common/Collision/Maps/MapTree.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h index 9b24c9abb1a..df1ce431109 100644 --- a/src/common/Collision/Maps/MapTree.h +++ b/src/common/Collision/Maps/MapTree.h @@ -28,6 +28,7 @@ namespace VMAP class ModelInstance; class GroupModel; class VMapManager2; + enum class LoadResult : uint8; enum class ModelIgnoreFlags : uint32; struct TC_COMMON_API LocationInfo @@ -72,7 +73,7 @@ namespace VMAP static std::string getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY); static uint32 packTileID(uint32 tileX, uint32 tileY) { return tileX<<16 | tileY; } static void unpackTileID(uint32 ID, uint32 &tileX, uint32 &tileY) { tileX = ID >> 16; tileY = ID & 0xFF; } - static bool CanLoadMap(const std::string &basePath, uint32 mapID, uint32 tileX, uint32 tileY, VMapManager2* vm); + static LoadResult CanLoadMap(const std::string &basePath, uint32 mapID, uint32 tileX, uint32 tileY, VMapManager2* vm); StaticMapTree(uint32 mapID, const std::string &basePath); ~StaticMapTree(); |