Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/vmaps: Stop worldserver startup when gameobject models cannot be loaded

Browse Source
This commit is contained in:
Shauren
2022-12-20 16:01:28 +01:00
parent 69cc799447
commit a2ec80b14c
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@
#include "GameObjectModel.h"
#include "Log.h"
#include "MapTree.h"
#include "Memory.h"
#include "Timer.h"
#include <G3D/Quat.h>
@@ -42,24 +43,23 @@ struct GameobjectModelData
typedef std::unordered_map<uint32, GameobjectModelData> ModelList;
ModelList model_list;
void LoadGameObjectModelList(std::string const& dataPath)
bool LoadGameObjectModelList(std::string const& dataPath)
{
uint32 oldMSTime = getMSTime();
FILE* model_list_file = fopen((dataPath + "vmaps/" + VMAP::GAMEOBJECT_MODELS).c_str(), "rb");
auto model_list_file = Trinity::make_unique_ptr_with_deleter(fopen((dataPath + "vmaps/" + VMAP::GAMEOBJECT_MODELS).c_str(), "rb"), &::fclose);
if (!model_list_file)
{
TC_LOG_ERROR("misc", "Unable to open '%s' file.", VMAP::GAMEOBJECT_MODELS);
return;
return false;
}
char magic[8];
if (fread(magic, 1, 8, model_list_file) != 8
if (fread(magic, 1, 8, model_list_file.get()) != 8
|| memcmp(magic, VMAP::VMAP_MAGIC, 8) != 0)
{
TC_LOG_ERROR("misc", "File '%s' has wrong header, expected %s.", VMAP::GAMEOBJECT_MODELS, VMAP::VMAP_MAGIC);
fclose(model_list_file);
return;
return false;
}
uint32 name_length, displayId;
@@ -68,16 +68,16 @@ void LoadGameObjectModelList(std::string const& dataPath)
while (true)
{
Vector3 v1, v2;
if (fread(&displayId, sizeof(uint32), 1, model_list_file) != 1)
if (feof(model_list_file)) // EOF flag is only set after failed reading attempt
if (fread(&displayId, sizeof(uint32), 1, model_list_file.get()) != 1)
if (feof(model_list_file.get())) // EOF flag is only set after failed reading attempt
break;
if (fread(&isWmo, sizeof(uint8), 1, model_list_file) != 1
|| fread(&name_length, sizeof(uint32), 1, model_list_file) != 1
if (fread(&isWmo, sizeof(uint8), 1, model_list_file.get()) != 1
|| fread(&name_length, sizeof(uint32), 1, model_list_file.get()) != 1
|| name_length >= sizeof(buff)
|| fread(&buff, sizeof(char), name_length, model_list_file) != name_length
|| fread(&v1, sizeof(Vector3), 1, model_list_file) != 1
|| fread(&v2, sizeof(Vector3), 1, model_list_file) != 1)
|| fread(&buff, sizeof(char), name_length, model_list_file.get()) != name_length
|| fread(&v1, sizeof(Vector3), 1, model_list_file.get()) != 1
|| fread(&v2, sizeof(Vector3), 1, model_list_file.get()) != 1)
{
TC_LOG_ERROR("misc", "File '%s' seems to be corrupted!", VMAP::GAMEOBJECT_MODELS);
break;
@@ -92,8 +92,8 @@ void LoadGameObjectModelList(std::string const& dataPath)
model_list.emplace(std::piecewise_construct, std::forward_as_tuple(displayId), std::forward_as_tuple(&buff[0], name_length, v1, v2, isWmo != 0));
}
fclose(model_list_file);
TC_LOG_INFO("server.loading", ">> Loaded %u GameObject models in %u ms", uint32(model_list.size()), GetMSTimeDiffToNow(oldMSTime));
return true;
}
GameObjectModel::~GameObjectModel()

2
src/common/Collision/Models/GameObjectModel.h
View File

@@ -97,6 +97,6 @@ private:
bool isWmo;
};
TC_COMMON_API void LoadGameObjectModelList(std::string const& dataPath);
TC_COMMON_API bool LoadGameObjectModelList(std::string const& dataPath);
#endif // _GAMEOBJECT_MODEL_H

8
src/server/game/World/World.cpp
View File

@@ -1765,7 +1765,7 @@ void World::SetInitialWorldSettings()
!TerrainMgr::ExistMapAndVMap(530, 10349.6f, -6357.29f) ||
!TerrainMgr::ExistMapAndVMap(530, -3961.64f, -13931.2f))))
{
TC_LOG_FATAL("server.loading", "Unable to load critical files - server shutting down !!!");
TC_LOG_FATAL("server.loading", "Unable to load map and vmap data for starting zones - server shutting down!");
exit(1);
}
@@ -1883,7 +1883,11 @@ void World::SetInitialWorldSettings()
sLanguageMgr->LoadLanguagesWords();
TC_LOG_INFO("server.loading", "Loading GameObject models...");
LoadGameObjectModelList(m_dataPath);
if (!LoadGameObjectModelList(m_dataPath))
{
TC_LOG_FATAL("server.loading", "Unable to load gameobject models, objects using WMO models will crash the client - server shutting down!");
exit(1);
}
TC_LOG_INFO("server.loading", "Loading Instance Template...");
sObjectMgr->LoadInstanceTemplate();