mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-23 10:26:28 +01:00
Core: Remove some now defunct code and configoptions. Thanks to 4178something...
Closes issue 5213. --HG-- branch : trunk
This commit is contained in:
@@ -620,15 +620,6 @@ void World::LoadConfigSettings(bool reload)
|
||||
else
|
||||
m_int_configs[CONFIG_PORT_WORLD] = sConfig.GetIntDefault("WorldServerPort", 8085);
|
||||
|
||||
if (reload)
|
||||
{
|
||||
uint32 val = sConfig.GetIntDefault("SocketSelectTime", 10000);
|
||||
if (val != m_int_configs[CONFIG_SOCKET_SELECTTIME])
|
||||
sLog.outError("SocketSelectTime option can't be changed at worldserver.conf reload, using current value (%u).",m_int_configs[CONFIG_SOCKET_SELECTTIME]);
|
||||
}
|
||||
else
|
||||
m_int_configs[CONFIG_SOCKET_SELECTTIME] = sConfig.GetIntDefault("SocketSelectTime", 10000);
|
||||
|
||||
m_int_configs[CONFIG_SOCKET_TIMEOUTTIME] = sConfig.GetIntDefault("SocketTimeOutTime", 900000);
|
||||
m_int_configs[CONFIG_SESSION_ADD_DELAY] = sConfig.GetIntDefault("SessionAddDelay", 10000);
|
||||
|
||||
@@ -1140,7 +1131,6 @@ void World::LoadConfigSettings(bool reload)
|
||||
|
||||
m_int_configs[CONFIG_MAX_WHO] = sConfig.GetIntDefault("MaxWhoListReturns", 49);
|
||||
m_bool_configs[CONFIG_PET_LOS] = sConfig.GetBoolDefault("vmap.petLOS", true);
|
||||
m_bool_configs[CONFIG_BG_START_MUSIC] = sConfig.GetBoolDefault("MusicInBattleground", false);
|
||||
m_bool_configs[CONFIG_START_ALL_SPELLS] = sConfig.GetBoolDefault("PlayerStart.AllSpells", false);
|
||||
if (m_bool_configs[CONFIG_START_ALL_SPELLS])
|
||||
sLog.outString("WORLD: WARNING: PlayerStart.AllSpells enabled - may not function as intended!");
|
||||
|
||||
@@ -142,7 +142,6 @@ enum WorldBoolConfigs
|
||||
CONFIG_OFFHAND_CHECK_AT_SPELL_UNLEARN,
|
||||
CONFIG_VMAP_INDOOR_CHECK,
|
||||
CONFIG_PET_LOS,
|
||||
CONFIG_BG_START_MUSIC,
|
||||
CONFIG_START_ALL_SPELLS,
|
||||
CONFIG_START_ALL_EXPLORED,
|
||||
CONFIG_START_ALL_REP,
|
||||
@@ -192,7 +191,6 @@ enum WorldIntConfigs
|
||||
CONFIG_INTERVAL_CHANGEWEATHER,
|
||||
CONFIG_INTERVAL_DISCONNECT_TOLERANCE,
|
||||
CONFIG_PORT_WORLD,
|
||||
CONFIG_SOCKET_SELECTTIME,
|
||||
CONFIG_SOCKET_TIMEOUTTIME,
|
||||
CONFIG_SESSION_ADD_DELAY,
|
||||
CONFIG_GAME_TYPE,
|
||||
|
||||
@@ -205,13 +205,6 @@ MaxOverspeedPings = 2
|
||||
|
||||
GridUnload = 1
|
||||
|
||||
#
|
||||
# SocketSelectTime
|
||||
# Description: Time (in milliseconds) for socket selection.
|
||||
# Default: 10000 - (10 seconds)
|
||||
|
||||
SocketSelectTime = 10000
|
||||
|
||||
#
|
||||
# SocketTimeOutTime
|
||||
# Description: Time (in milliseconds) after which a connection being idle on the character
|
||||
|
||||
Reference in New Issue
Block a user