From 779a59e7e218e340ac5cefd3297ea970d804239d Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 15 Jul 2013 17:31:44 +0200 Subject: Core/Config: Refactored ConfigMgr * Loading initial configuration files is now separate from loading any additional custom configs --- src/server/worldserver/RemoteAccess/RARunnable.cpp | 6 +++--- src/server/worldserver/RemoteAccess/RASocket.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/worldserver/RemoteAccess') diff --git a/src/server/worldserver/RemoteAccess/RARunnable.cpp b/src/server/worldserver/RemoteAccess/RARunnable.cpp index edb7e048aa3..465e605beac 100644 --- a/src/server/worldserver/RemoteAccess/RARunnable.cpp +++ b/src/server/worldserver/RemoteAccess/RARunnable.cpp @@ -56,13 +56,13 @@ RARunnable::~RARunnable() void RARunnable::run() { - if (!ConfigMgr::GetBoolDefault("Ra.Enable", false)) + if (!sConfigMgr->GetBoolDefault("Ra.Enable", false)) return; ACE_Acceptor acceptor; - uint16 raport = uint16(ConfigMgr::GetIntDefault("Ra.Port", 3443)); - std::string stringip = ConfigMgr::GetStringDefault("Ra.IP", "0.0.0.0"); + uint16 raport = uint16(sConfigMgr->GetIntDefault("Ra.Port", 3443)); + std::string stringip = sConfigMgr->GetStringDefault("Ra.IP", "0.0.0.0"); ACE_INET_Addr listen_addr(raport, stringip.c_str()); if (acceptor.open(listen_addr, m_Reactor) == -1) diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp index fa5fdfd3ca0..3fd4e34e89e 100644 --- a/src/server/worldserver/RemoteAccess/RASocket.cpp +++ b/src/server/worldserver/RemoteAccess/RASocket.cpp @@ -32,7 +32,7 @@ RASocket::RASocket() { - _minLevel = uint8(ConfigMgr::GetIntDefault("RA.MinLevel", 3)); + _minLevel = uint8(sConfigMgr->GetIntDefault("RA.MinLevel", 3)); _commandExecuting = false; } -- cgit v1.2.3