diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
| commit | 382067b05c4fe97bcf0da0143405375ec295f7c6 (patch) | |
| tree | f668cd2595ac0c85f0942f88729d3ff1956676fa /src/client.cpp | |
| parent | ee8191705826d978b7793497fdd307536c709bff (diff) | |
| parent | 9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff) | |
| download | plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2 plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/client.cpp b/src/client.cpp index 4d301ccfe..ab3add135 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -66,7 +66,7 @@ #include "gui/windows/registerdialog.h" #include "gui/windows/selldialog.h" #include "gui/windows/serverdialog.h" -#include "gui/windows/setup.h" +#include "gui/windows/setupwindow.h" #include "gui/windows/unregisterdialog.h" #include "gui/windows/updaterwindow.h" #include "gui/windows/quitdialog.h" @@ -527,7 +527,7 @@ void Client::initSoundManager() void Client::createWindows() { userPalette = new UserPalette; - setupWindow = new Setup; + setupWindow = new SetupWindow; setupWindow->postInit(); helpWindow = new HelpWindow; didYouKnowWindow = new DidYouKnowWindow; @@ -2106,7 +2106,7 @@ void Client::initServerConfig(std::string serverName) dropShortcut = new DropShortcut; } -void Client::initFeatures() const +void Client::initFeatures() { features.init(paths.getStringValue("featuresFile"), true); features.setDefaultValues(getFeaturesDefaults()); @@ -2337,7 +2337,7 @@ void Client::initScreenshotDir() logger->log("screenshotDirectory: " + mScreenshotDir); } -void Client::accountLogin(LoginData *const data) const +void Client::accountLogin(LoginData *const data) { if (!data) return; @@ -2758,7 +2758,7 @@ bool Client::limitPackets(const int type) return true; } -void Client::setFramerate(const int fpsLimit) +void Client::setFramerate(const int fpsLimit) const { if (!fpsLimit) return; @@ -3012,7 +3012,7 @@ void Client::setIcon() #else iconFile.append(".png"); #endif - iconFile = ResourceManager::getInstance()->getPath(iconFile); + iconFile = ResourceManager::getPath(iconFile); logger->log("Loading icon from file: %s", iconFile.c_str()); #ifdef WIN32 |