nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-29 08:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Vmaps): Changed error message when loading outdated vmaps (#10490)

Browse Source
This commit is contained in:
IntelligentQuantum
2022-04-01 14:26:04 +04:30
committed by GitHub
parent e8e8c34590
commit cc5f26db7f
6 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/Collision/Management/IVMapMgr.h
View File

@@ -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;

2
src/common/Collision/Management/VMapMgr2.cpp
View File

@@ -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);
}

2
src/common/Collision/Management/VMapMgr2.h
View File

@@ -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);