diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-06 15:53:30 +0100 |
| commit | da77a5f25dbf9cdfbb33ddae1c01ed961f41374f (patch) | |
| tree | 7160c19d185fa8d0bf826c09c9346cdc8354e50d /src/client.cpp | |
| parent | f0bf3996fbc2f9dc3edc55b45e4fa3a3a6275db4 (diff) | |
| parent | 3a447afa534573ed4a014372c687ef4028d16760 (diff) | |
| download | mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.gz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.bz2 mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.xz mana-client-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.zip | |
Merge branch 'master' of gitorious.org:mana/mana
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 dfa42034..1b9dcd4c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -40,7 +40,6 @@ #include "gui/charselectdialog.h" #include "gui/connectiondialog.h" #include "gui/gui.h" -#include "gui/skin.h" #include "gui/login.h" #include "gui/okdialog.h" #include "gui/palette.h" @@ -49,6 +48,7 @@ #include "gui/sdlinput.h" #include "gui/serverdialog.h" #include "gui/setup.h" +#include "gui/theme.h" #include "gui/unregisterdialog.h" #include "gui/updatewindow.h" #include "gui/worldselectdialog.h" @@ -340,7 +340,7 @@ Client::Client(const Options &options): // Initialize for drawing graphics->_beginDraw(); - SkinLoader::prepareThemePath(); + Theme::prepareThemePath(); // Initialize the item and emote shortcuts. itemShortcut = new ItemShortcut; @@ -601,7 +601,7 @@ int Client::exec() { // Don't allow an alpha opacity // lower than the default value - SkinLoader::instance()->setMinimumOpacity(0.8f); + Theme::instance()->setMinimumOpacity(0.8f); mCurrentDialog = new ServerDialog(&mCurrentServer, mConfigDir); @@ -627,7 +627,7 @@ int Client::exec() logger->log("State: LOGIN"); // Don't allow an alpha opacity // lower than the default value - SkinLoader::instance()->setMinimumOpacity(0.8f); + Theme::instance()->setMinimumOpacity(0.8f); if (mOptions.username.empty() || mOptions.password.empty()) @@ -744,7 +744,7 @@ int Client::exec() logger->log("State: CHAR SELECT"); // Don't allow an alpha opacity // lower than the default value - SkinLoader::instance()->setMinimumOpacity(0.8f); + Theme::instance()->setMinimumOpacity(0.8f); mCurrentDialog = new CharSelectDialog(&loginData); @@ -781,7 +781,7 @@ int Client::exec() sound.fadeOutMusic(1000); // Allow any alpha opacity - SkinLoader::instance()->setMinimumOpacity(-1.0f); + Theme::instance()->setMinimumOpacity(-1.0f); delete mSetupButton; delete mDesktop; |