diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-29 12:56:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-29 12:56:16 +0300 |
| commit | 1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f (patch) | |
| tree | 3eea380919dae735fdbeacff314edf1ad06d26ab /src/gui/windows/chatwindow.cpp | |
| parent | 0b7ef18ac3c7fb4e3717f6311d4e21a31ff440d5 (diff) | |
| download | manaplus-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.gz manaplus-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.bz2 manaplus-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.xz manaplus-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.zip | |
Move many variables from client into settings.
Diffstat (limited to 'src/gui/windows/chatwindow.cpp')
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index fb7219ed9..921d32fff 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -29,6 +29,7 @@ #include "game.h" #include "guild.h" #include "party.h" +#include "settings.h" #include "spellshortcut.h" #include "being/attributes.h" @@ -1520,7 +1521,7 @@ void ChatWindow::localPetEmote(const std::string &nick, const uint8_t emoteId) void ChatWindow::initTradeFilter() { - const std::string tradeListName = client->getServerConfigDirectory() + const std::string tradeListName = settings.serverConfigDir + "/tradefilter.txt"; std::ifstream tradeFile; @@ -1670,7 +1671,7 @@ void ChatWindow::loadCustomList() std::ifstream listFile; struct stat statbuf; - std::string listName = client->getServerConfigDirectory() + std::string listName = settings.serverConfigDir + "/customwords.txt"; if (!stat(listName.c_str(), &statbuf) && S_ISREG(statbuf.st_mode)) |