From c90882ed6e2aba3b2d421abdc17cb57bea61d04b Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 22 Jan 2017 12:06:02 +0100 Subject: Core/Vmaps: Changed error message when loading outdated vmaps Closes #18431 Closes #18857 --- src/common/Collision/Maps/MapTree.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/common/Collision/Maps/MapTree.h') diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h index 7f1415ff939..f5c11dd2bce 100644 --- a/src/common/Collision/Maps/MapTree.h +++ b/src/common/Collision/Maps/MapTree.h @@ -29,6 +29,7 @@ namespace VMAP class ModelInstance; class GroupModel; class VMapManager2; + enum class LoadResult : uint8; enum class ModelIgnoreFlags : uint32; struct TC_COMMON_API LocationInfo @@ -65,7 +66,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); + static LoadResult CanLoadMap(const std::string &basePath, uint32 mapID, uint32 tileX, uint32 tileY); StaticMapTree(uint32 mapID, const std::string &basePath); ~StaticMapTree(); -- cgit v1.2.3