pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-04 12:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix NPC Scale Manager leaking (#1254)

Browse Source 
It should be fine to init further down after the early returns.

This wasn't really a leak that affected performance, but mainly moving
to shutup valgrind
This commit is contained in:
Michael Cook (mackal) 2021-02-23 12:59:03 -05:00 committed by GitHub
parent f8edde9587
commit 0887eb0976
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zone/main.cpp
View File

@ -260,12 +260,6 @@ int main(int argc, char** argv) {
guild_mgr.SetDatabase(&database); guild_mgr.SetDatabase(&database);
GuildBanks = nullptr; GuildBanks = nullptr;
/**
* NPC Scale Manager
*/
npc_scale_manager = new NpcScaleManager;
npc_scale_manager->LoadScaleData();
#ifdef _EQDEBUG #ifdef _EQDEBUG
_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
#endif #endif
@ -406,6 +400,12 @@ int main(int argc, char** argv) {
LogError("Bot spell casting chances loading failed"); LogError("Bot spell casting chances loading failed");
#endif #endif
/**
* NPC Scale Manager
*/
npc_scale_manager = new NpcScaleManager;
npc_scale_manager->LoadScaleData();
if (RuleB(TaskSystem, EnableTaskSystem)) { if (RuleB(TaskSystem, EnableTaskSystem)) {
task_manager = new TaskManager; task_manager = new TaskManager;
task_manager->LoadTasks(); task_manager->LoadTasks();
@ -588,6 +588,7 @@ int main(int argc, char** argv) {
Zone::Shutdown(true); Zone::Shutdown(true);
//Fix for Linux world server problem. //Fix for Linux world server problem.
safe_delete(task_manager); safe_delete(task_manager);
safe_delete(npc_scale_manager);
command_deinit(); command_deinit();
#ifdef BOTS #ifdef BOTS
bot_command_deinit(); bot_command_deinit();