mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 07:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix server startup. Thanks Rochet and H0zen

Browse source
This commit is contained in:
Antz 2017-03-19 12:17:12 +00:00 • committed by Antz
parent 8580aa02fb
commit 0bf26d3e8d
1 changed files with 547 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/game/WorldHandlers/World.cpp
View file

@ -574,7 +574,7 @@ void World::LoadConfigSettings(bool reload)
VMAP::VMapFactory::chompAndTrim(forceLoadGridOnMaps); VMAP::VMapFactory::chompAndTrim(forceLoadGridOnMaps);
while (VMAP::VMapFactory::getNextId(forceLoadGridOnMaps, pos, id)) while (VMAP::VMapFactory::getNextId(forceLoadGridOnMaps, pos, id))
m_configForceLoadMapIds.insert(id); m_configForceLoadMapIds.insert(id);
}
setConfig(CONFIG_UINT32_AUTOBROADCAST_INTERVAL, "AutoBroadcast", 600); setConfig(CONFIG_UINT32_AUTOBROADCAST_INTERVAL, "AutoBroadcast", 600);
if (getConfig(CONFIG_UINT32_AUTOBROADCAST_INTERVAL) > 0) if (getConfig(CONFIG_UINT32_AUTOBROADCAST_INTERVAL) > 0)
@ -868,7 +868,7 @@ void World::LoadConfigSettings(bool reload)
setConfig(CONFIG_BOOL_PET_UNSUMMON_AT_MOUNT, "PetUnsummonAtMount", false); setConfig(CONFIG_BOOL_PET_UNSUMMON_AT_MOUNT, "PetUnsummonAtMount", false);
// Warden // Warden
/* badly broken on m3 :( - this causes all these defaults to be set to 0 /* badly broken on m3 :( - this causes all these defaults to be set to 0
setConfig(CONFIG_BOOL_WARDEN_WIN_ENABLED, "Warden.WinEnabled", true); setConfig(CONFIG_BOOL_WARDEN_WIN_ENABLED, "Warden.WinEnabled", true);
setConfig(CONFIG_BOOL_WARDEN_OSX_ENABLED, "Warden.OSXEnabled", false); setConfig(CONFIG_BOOL_WARDEN_OSX_ENABLED, "Warden.OSXEnabled", false);
setConfig(CONFIG_UINT32_WARDEN_NUM_MEM_CHECKS, "Warden.NumMemChecks", 3); setConfig(CONFIG_UINT32_WARDEN_NUM_MEM_CHECKS, "Warden.NumMemChecks", 3);
@ -1010,10 +1010,11 @@ void World::LoadConfigSettings(bool reload)
#ifdef ENABLE_ELUNA #ifdef ENABLE_ELUNA
if (reload) if (reload)
{
sEluna->OnConfigLoad(reload); sEluna->OnConfigLoad(reload);
}
#endif /* ENABLE_ELUNA */ #endif /* ENABLE_ELUNA */
sLog.outString(); sLog.outString();
}
} }
/// Initialize the World /// Initialize the World