From 0bdf12f3dd07a036d799d5b19770817ff6c9225e Mon Sep 17 00:00:00 2001 From: w12x Date: Fri, 17 Oct 2008 16:51:27 -0500 Subject: [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 --- src/game/World.cpp | 1 - src/game/World.h | 1 - src/trinitycore/trinitycore.conf.dist | 6 ------ 3 files changed, 8 deletions(-) (limited to 'src') diff --git a/src/game/World.cpp b/src/game/World.cpp index bba7d1e1e85..93cb249aef7 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -539,7 +539,6 @@ void World::LoadConfigSettings(bool reload) 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); /// \todo Add MonsterSight and GuarderSight (with meaning) in Trinityd.conf or put them as define m_configs[CONFIG_SIGHT_MONSTER] = sConfig.GetIntDefault("MonsterSight", 50); diff --git a/src/game/World.h b/src/game/World.h index 4d942ce25a8..94c41687300 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -147,7 +147,6 @@ enum WorldConfigs CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL, CONFIG_TALENTS_INSPECTING, CONFIG_CHAT_FAKE_MESSAGE_PREVENTING, - CONFIG_TCP_NO_DELAY, CONFIG_CORPSE_DECAY_NORMAL, CONFIG_CORPSE_DECAY_RARE, CONFIG_CORPSE_DECAY_ELITE, diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index eab2af94eeb..ba3f4bdd881 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -92,11 +92,6 @@ EAIErrorLevel = 2 # Default: 1 (speed) # 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 # Maximum number of players in the world. Excluding Mods, GM's and Admins # Default: 100 @@ -182,7 +177,6 @@ EAIErrorLevel = 2 UseProcessors = 0 ProcessPriority = 1 Compression = 1 -TcpNoDelay = 0 PlayerLimit = 100 SaveRespawnTimeImmediately = 1 MaxOverspeedPings = 2 -- cgit v1.2.3