[svn] Removed the no longer used TcpNoDelay config option and the matching CONFIG_TCP_NO_DELAY config variable. It can be set using the Network.TcpNodelay option now. Patch provided by raczman.

--HG--
branch : trunk
This commit is contained in:
w12x
2008-10-17 16:51:27 -05:00
parent ab9eb277b4
commit 0bdf12f3dd
3 changed files with 0 additions and 8 deletions
-1
View File
@@ -539,7 +539,6 @@ void World::LoadConfigSettings(bool reload)
m_configs[CONFIG_SOCKET_SELECTTIME] = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME); m_configs[CONFIG_SOCKET_SELECTTIME] = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME);
m_configs[CONFIG_TCP_NO_DELAY] = sConfig.GetBoolDefault("TcpNoDelay", false);
m_configs[CONFIG_GROUP_XP_DISTANCE] = sConfig.GetIntDefault("MaxGroupXPDistance", 74); m_configs[CONFIG_GROUP_XP_DISTANCE] = sConfig.GetIntDefault("MaxGroupXPDistance", 74);
/// \todo Add MonsterSight and GuarderSight (with meaning) in Trinityd.conf or put them as define /// \todo Add MonsterSight and GuarderSight (with meaning) in Trinityd.conf or put them as define
m_configs[CONFIG_SIGHT_MONSTER] = sConfig.GetIntDefault("MonsterSight", 50); m_configs[CONFIG_SIGHT_MONSTER] = sConfig.GetIntDefault("MonsterSight", 50);
-1
View File
@@ -147,7 +147,6 @@ enum WorldConfigs
CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL, CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL,
CONFIG_TALENTS_INSPECTING, CONFIG_TALENTS_INSPECTING,
CONFIG_CHAT_FAKE_MESSAGE_PREVENTING, CONFIG_CHAT_FAKE_MESSAGE_PREVENTING,
CONFIG_TCP_NO_DELAY,
CONFIG_CORPSE_DECAY_NORMAL, CONFIG_CORPSE_DECAY_NORMAL,
CONFIG_CORPSE_DECAY_RARE, CONFIG_CORPSE_DECAY_RARE,
CONFIG_CORPSE_DECAY_ELITE, CONFIG_CORPSE_DECAY_ELITE,
-6
View File
@@ -92,11 +92,6 @@ EAIErrorLevel = 2
# Default: 1 (speed) # Default: 1 (speed)
# 9 (best compression) # 9 (best compression)
# #
# TcpNoDelay
# TCP Nagle algorithm setting
# Default: 0 (enable Nagle algorithm, less traffic, more latency)
# 1 (TCP_NO_DELAY, disable Nagle algorithm, more traffic but less latency)
#
# PlayerLimit # PlayerLimit
# Maximum number of players in the world. Excluding Mods, GM's and Admins # Maximum number of players in the world. Excluding Mods, GM's and Admins
# Default: 100 # Default: 100
@@ -182,7 +177,6 @@ EAIErrorLevel = 2
UseProcessors = 0 UseProcessors = 0
ProcessPriority = 1 ProcessPriority = 1
Compression = 1 Compression = 1
TcpNoDelay = 0
PlayerLimit = 100 PlayerLimit = 100
SaveRespawnTimeImmediately = 1 SaveRespawnTimeImmediately = 1
MaxOverspeedPings = 2 MaxOverspeedPings = 2