summaryrefslogtreecommitdiff
path: root/src/gui/windows/shopwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-29 12:56:16 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-29 12:56:16 +0300
commit1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f (patch)
tree3eea380919dae735fdbeacff314edf1ad06d26ab /src/gui/windows/shopwindow.cpp
parent0b7ef18ac3c7fb4e3717f6311d4e21a31ff440d5 (diff)
downloadmanaverse-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.gz
manaverse-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.bz2
manaverse-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.tar.xz
manaverse-1b500cb24655e2ad3e6c6fd20143ce0d2d070d6f.zip
Move many variables from client into settings.
Diffstat (limited to 'src/gui/windows/shopwindow.cpp')
-rw-r--r--src/gui/windows/shopwindow.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 2d13cf23f..51d102972 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -48,6 +48,7 @@
#include "configuration.h"
#include "inventory.h"
#include "item.h"
+#include "settings.h"
#include "shopitem.h"
#include "soundmanager.h"
@@ -371,7 +372,7 @@ void ShopWindow::loadList()
mBuyShopItems->clear();
mSellShopItems->clear();
- const std::string shopListName = client->getServerConfigDirectory()
+ const std::string shopListName = settings.serverConfigDir
+ "/shoplist.txt";
if (!stat(shopListName.c_str(), &statbuf) && S_ISREG(statbuf.st_mode))
@@ -421,7 +422,7 @@ void ShopWindow::saveList() const
return;
std::ofstream shopFile;
- const std::string shopListName = client->getServerConfigDirectory()
+ const std::string shopListName = settings.serverConfigDir
+ "/shoplist.txt";
std::map<int, ShopItem*> mapItems;