diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-15 18:04:04 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-15 18:04:04 +0200 |
| commit | 56bd42dcf1ffdf0bf8099a1c87dc7a52ca9663ff (patch) | |
| tree | d951e7af2b120fe1ba58373aa528fb1a5f4b5263 /src/server/game/Server | |
| parent | 7104e3c70f9849dfbc481084a8bd3c20d99b3036 (diff) | |
| parent | 779a59e7e218e340ac5cefd3297ea970d804239d (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/World/World.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Protocol/PacketLog.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSocketMgr.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Server/Protocol/PacketLog.cpp b/src/server/game/Server/Protocol/PacketLog.cpp index fe8b6804020..aeeb0a285a4 100644 --- a/src/server/game/Server/Protocol/PacketLog.cpp +++ b/src/server/game/Server/Protocol/PacketLog.cpp @@ -35,13 +35,13 @@ PacketLog::~PacketLog() void PacketLog::Initialize() { - std::string logsDir = ConfigMgr::GetStringDefault("LogsDir", ""); + std::string logsDir = sConfigMgr->GetStringDefault("LogsDir", ""); if (!logsDir.empty()) if ((logsDir.at(logsDir.length()-1) != '/') && (logsDir.at(logsDir.length()-1) != '\\')) logsDir.push_back('/'); - std::string logname = ConfigMgr::GetStringDefault("PacketLogFile", ""); + std::string logname = sConfigMgr->GetStringDefault("PacketLogFile", ""); if (!logname.empty()) _file = fopen((logsDir + logname).c_str(), "wb"); } diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index ce89243c005..57a77773d52 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -230,9 +230,9 @@ WorldSocketMgr::~WorldSocketMgr() int WorldSocketMgr::StartReactiveIO (ACE_UINT16 port, const char* address) { - m_UseNoDelay = ConfigMgr::GetBoolDefault ("Network.TcpNodelay", true); + m_UseNoDelay = sConfigMgr->GetBoolDefault ("Network.TcpNodelay", true); - int num_threads = ConfigMgr::GetIntDefault ("Network.Threads", 1); + int num_threads = sConfigMgr->GetIntDefault ("Network.Threads", 1); if (num_threads <= 0) { @@ -247,9 +247,9 @@ WorldSocketMgr::StartReactiveIO (ACE_UINT16 port, const char* address) TC_LOG_DEBUG(LOG_FILTER_GENERAL, "Max allowed socket connections %d", ACE::max_handles()); // -1 means use default - m_SockOutKBuff = ConfigMgr::GetIntDefault ("Network.OutKBuff", -1); + m_SockOutKBuff = sConfigMgr->GetIntDefault ("Network.OutKBuff", -1); - m_SockOutUBuff = ConfigMgr::GetIntDefault ("Network.OutUBuff", 65536); + m_SockOutUBuff = sConfigMgr->GetIntDefault ("Network.OutUBuff", 65536); if (m_SockOutUBuff <= 0) { |