From 576b7dca4676ba2c1ea63afb6bbc96fd11183048 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 23 Aug 2013 22:20:47 +0300
Subject: improve dirs usage in Client.

---
 src/client.cpp | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index ccd2b76c7..4838618b6 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -2457,7 +2457,7 @@ void Client::storeSafeParameters() const
 void Client::initTradeFilter() const
 {
     const std::string tradeListName =
-        Client::getServerConfigDirectory() + "/tradefilter.txt";
+        getServerConfigDirectory() + "/tradefilter.txt";
 
     std::ofstream tradeFile;
     struct stat statbuf;
@@ -2489,7 +2489,7 @@ void Client::initTradeFilter() const
 
 void Client::initUsersDir()
 {
-    mUsersDir = Client::getServerConfigDirectory() + "/users/";
+    mUsersDir = getServerConfigDirectory() + "/users/";
     if (mkdir_r(mUsersDir.c_str()))
     {
         // TRANSLATORS: directory creation error
@@ -2497,7 +2497,7 @@ void Client::initUsersDir()
             "Exiting."), mUsersDir.c_str()));
     }
 
-    mNpcsDir = Client::getServerConfigDirectory() + "/npcs/";
+    mNpcsDir = getServerConfigDirectory() + "/npcs/";
     if (mkdir_r(mNpcsDir.c_str()))
     {
         // TRANSLATORS: directory creation error
@@ -2586,8 +2586,8 @@ void Client::initPacketLimiter()
 
     if (!mServerConfigDir.empty())
     {
-        const std::string packetLimitsName =
-            Client::getServerConfigDirectory() + "/packetlimiter.txt";
+        const std::string packetLimitsName = getServerConfigDirectory()
+            + "/packetlimiter.txt";
 
         std::ifstream inPacketFile;
         struct stat statbuf;
@@ -2730,21 +2730,6 @@ bool Client::limitPackets(const int type)
     return true;
 }
 
-const std::string Client::getServerConfigDirectory()
-{
-    return instance()->mServerConfigDir;
-}
-
-const std::string Client::getUsersDirectory()
-{
-    return instance()->mUsersDir;
-}
-
-const std::string Client::getNpcsDirectory()
-{
-    return instance()->mNpcsDir;
-}
-
 void Client::setGuiAlpha(const float n)
 {
     instance()->mGuiAlpha = n;
-- 
cgit v1.2.3-60-g2f50