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

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-05-22 12:08:05 -06:00
committed by GitHub
parent 34b332b51b f7674acb58
commit 0d42597ba3
17 changed files with 334 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/Collision/Maps/TileAssembler.cpp
View File

@@ -382,6 +382,7 @@ namespace VMAP
char ident[8];
if (fread(ident, 1, 8, model_list) != 8 || memcmp(ident, VMAP::RAW_VMAP_MAGIC, 8) != 0)
{
fclose(model_list);
return;
}

1
src/common/Collision/Models/GameObjectModel.cpp
View File

@@ -57,6 +57,7 @@ void LoadGameObjectModelList(std::string const& dataPath)
if (fread(magic, 1, 8, model_list_file) != 8 || memcmp(magic, VMAP::VMAP_MAGIC, 8) != 0)
{
LOG_ERROR("maps", "File '{}' has wrong header, expected {}.", VMAP::GAMEOBJECT_MODELS, VMAP::VMAP_MAGIC);
fclose(model_list_file);
return;
}