diff options
| -rwxr-xr-x | src/server/game/World/World.cpp | 10 | ||||
| -rwxr-xr-x | src/server/game/World/World.h | 2 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 7 |
3 files changed, 0 insertions, 19 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 625c7eb2492..3525cbcfaa6 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -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!"); diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 02c1dbed570..46aa4470159 100755 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -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, diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 746bc019699..618553cee3d 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -206,13 +206,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 # selection screen is disconnected. |