From 01c3edf0d8692ecf6c45ae4e04abf2d0b1f41c6b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 27 Feb 2010 01:55:08 +0200
Subject: Fix configuration saving on exit.

Some settings are set after the old position.

Signed-off-by: Jared Adams <jaxad0127@gmail.com>
---
 src/client.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index cd40615b..b95076ff 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -400,8 +400,6 @@ Client::~Client()
     delete itemShortcut;
     delete emoteShortcut;
 
-    config.write();
-
     delete gui;
     delete graphics;
 
@@ -425,6 +423,9 @@ Client::~Client()
 
     logger->log("Quitting");
     delete guiPalette;
+
+    config.write();
+
     delete logger;
 
     mInstance = 0;
-- 
cgit v1.2.3-70-g09d2


From f35dacee58e89528d8a6d638075bc96aa5d5ec0e Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Sat, 27 Feb 2010 17:17:51 +0100
Subject: Added m prefix to Client's member variables

Reviewed-by: Jared Adams
---
 src/client.cpp | 316 ++++++++++++++++++++++++++++-----------------------------
 src/client.h   |  38 +++----
 2 files changed, 177 insertions(+), 177 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index b95076ff..722d8116 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -193,12 +193,12 @@ Client *Client::mInstance = 0;
 
 Client::Client(const Options &options):
     options(options),
-    currentDialog(0),
-    quitDialog(0),
-    desktop(0),
-    setupButton(0),
-    state(STATE_CHOOSE_SERVER),
-    oldstate(STATE_START),
+    mCurrentDialog(0),
+    mQuitDialog(0),
+    mDesktop(0),
+    mSetupButton(0),
+    mState(STATE_CHOOSE_SERVER),
+    mOldState(STATE_START),
     mLogicCounterId(0),
     mSecondsCounterId(0),
     mLimitFps(false)
@@ -217,7 +217,7 @@ Client::Client(const Options &options):
     initHomeDir(options);
 
     // Configure logger
-    logger->setLogFile(localDataDir + std::string("/mana.log"));
+    logger->setLogFile(mLocalDataDir + std::string("/mana.log"));
 
     // Log the mana version
     logger->log("Mana %s", FULL_VERSION);
@@ -243,14 +243,14 @@ Client::Client(const Options &options):
 
     ResourceManager *resman = ResourceManager::getInstance();
 
-    if (!resman->setWriteDir(localDataDir))
+    if (!resman->setWriteDir(mLocalDataDir))
     {
         logger->error(strprintf("%s couldn't be set as home directory! "
-                                "Exiting.", localDataDir.c_str()));
+                                "Exiting.", mLocalDataDir.c_str()));
     }
 
     // Add the local data directory to PhysicsFS search path
-    resman->addToSearchPath(localDataDir, false);
+    resman->addToSearchPath(mLocalDataDir, false);
 
     // Add the main data directories to our PhysicsFS search path
     if (!options.dataPath.empty())
@@ -281,12 +281,12 @@ Client::Client(const Options &options):
         SetClassLong(pInfo.window, GCL_HICON, (LONG) icon);
     }
 #else
-    icon = IMG_Load(resman->getPath(
+    mIcon = IMG_Load(resman->getPath(
             branding.getValue("appIcon", "data/icons/mana.png")).c_str());
-    if (icon)
+    if (mIcon)
     {
-        SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
-        SDL_WM_SetIcon(icon, NULL);
+        SDL_SetAlpha(mIcon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
+        SDL_WM_SetIcon(mIcon, NULL);
     }
 #endif
 
@@ -340,7 +340,7 @@ Client::Client(const Options &options):
     }
     catch (const char *err)
     {
-        state = STATE_ERROR;
+        mState = STATE_ERROR;
         errorMessage = err;
         logger->log("Warning: %s", err);
     }
@@ -357,28 +357,28 @@ Client::Client(const Options &options):
     sound.playMusic(branding.getValue("loginMusic", "Magick - Real.ogg"));
 
     // Initialize default server
-    currentServer.hostname = options.serverName;
-    currentServer.port = options.serverPort;
+    mCurrentServer.hostname = options.serverName;
+    mCurrentServer.port = options.serverPort;
     loginData.username = options.username;
     loginData.password = options.password;
     loginData.remember = config.getValue("remember", 0);
     loginData.registerLogin = false;
 
-    if (currentServer.hostname.empty())
+    if (mCurrentServer.hostname.empty())
     {
-        currentServer.hostname = branding.getValue("defaultServer",
+        mCurrentServer.hostname = branding.getValue("defaultServer",
                                             "server.themanaworld.org").c_str();
     }
     if (options.serverPort == 0)
     {
-        currentServer.port = (short) branding.getValue("defaultPort",
+        mCurrentServer.port = (short) branding.getValue("defaultPort",
                                                        DEFAULT_PORT);
     }
     if (loginData.username.empty() && loginData.remember)
         loginData.username = config.getValue("username", "");
 
-    if (state != STATE_ERROR)
-        state = STATE_CHOOSE_SERVER;
+    if (mState != STATE_ERROR)
+        mState = STATE_CHOOSE_SERVER;
 
     // Initialize logic and seconds counters
     tick_time = 0;
@@ -419,7 +419,7 @@ Client::~Client()
 
     ResourceManager::deleteInstance();
 
-    SDL_FreeSurface(icon);
+    SDL_FreeSurface(mIcon);
 
     logger->log("Quitting");
     delete guiPalette;
@@ -438,7 +438,7 @@ int Client::exec()
     Game *game = 0;
     SDL_Event event;
 
-    while (state != STATE_EXIT)
+    while (mState != STATE_EXIT)
     {
         bool handledEvents = false;
 
@@ -457,7 +457,7 @@ int Client::exec()
                 switch (event.type)
                 {
                     case SDL_QUIT:
-                        state = STATE_EXIT;
+                        mState = STATE_EXIT;
                         break;
 
                     case SDL_KEYDOWN:
@@ -500,75 +500,75 @@ int Client::exec()
 
 
         // TODO: Add connect timeouts
-        if (state == STATE_CONNECT_GAME &&
+        if (mState == STATE_CONNECT_GAME &&
                  Net::getGameHandler()->isConnected())
         {
             Net::getLoginHandler()->disconnect();
         }
-        else if (state == STATE_CONNECT_SERVER && oldstate == STATE_CHOOSE_SERVER)
+        else if (mState == STATE_CONNECT_SERVER && mOldState == STATE_CHOOSE_SERVER)
         {
-            Net::connectToServer(currentServer);
+            Net::connectToServer(mCurrentServer);
         }
-        else if (state == STATE_CONNECT_SERVER &&
-                 oldstate != STATE_CHOOSE_SERVER &&
+        else if (mState == STATE_CONNECT_SERVER &&
+                 mOldState != STATE_CHOOSE_SERVER &&
                  Net::getLoginHandler()->isConnected())
         {
-            state = STATE_LOGIN;
+            mState = STATE_LOGIN;
         }
-        else if (state == STATE_WORLD_SELECT && oldstate == STATE_UPDATE)
+        else if (mState == STATE_WORLD_SELECT && mOldState == STATE_UPDATE)
         {
             if (Net::getLoginHandler()->getWorlds().size() < 2)
             {
-                state = STATE_LOGIN;
+                mState = STATE_LOGIN;
             }
         }
-        else if (oldstate == STATE_START ||
-                 (oldstate == STATE_GAME && state != STATE_GAME))
+        else if (mOldState == STATE_START ||
+                 (mOldState == STATE_GAME && mState != STATE_GAME))
         {
             gcn::Container *top = static_cast<gcn::Container*>(gui->getTop());
 
-            desktop = new Desktop;
-            top->add(desktop);
-            setupButton = new Button(_("Setup"), "Setup", this);
-            setupButton->setPosition(top->getWidth() - setupButton->getWidth()
+            mDesktop = new Desktop;
+            top->add(mDesktop);
+            mSetupButton = new Button(_("Setup"), "Setup", this);
+            mSetupButton->setPosition(top->getWidth() - mSetupButton->getWidth()
                                      - 3, 3);
-            top->add(setupButton);
+            top->add(mSetupButton);
 
             int screenWidth = (int) config.getValue("screenwidth",
                                                     defaultScreenWidth);
             int screenHeight = (int) config.getValue("screenheight",
                                                      defaultScreenHeight);
 
-            desktop->setSize(screenWidth, screenHeight);
+            mDesktop->setSize(screenWidth, screenHeight);
         }
 
-        if (state == STATE_SWITCH_LOGIN && oldstate == STATE_GAME)
+        if (mState == STATE_SWITCH_LOGIN && mOldState == STATE_GAME)
         {
             Net::getGameHandler()->disconnect();
         }
 
-        if (state != oldstate)
+        if (mState != mOldState)
         {
-            if (oldstate == STATE_GAME)
+            if (mOldState == STATE_GAME)
             {
                 delete game;
                 game = 0;
             }
 
-            oldstate = state;
+            mOldState = mState;
 
             // Get rid of the dialog of the previous state
-            if (currentDialog)
+            if (mCurrentDialog)
             {
-                delete currentDialog;
-                currentDialog = NULL;
+                delete mCurrentDialog;
+                mCurrentDialog = NULL;
             }
             // State has changed, while the quitDialog was active, it might
             // not be correct anymore
-            if (quitDialog)
-                quitDialog->scheduleDelete();
+            if (mQuitDialog)
+                mQuitDialog->scheduleDelete();
 
-            switch (state)
+            switch (mState)
             {
                 case STATE_CHOOSE_SERVER:
                     logger->log("State: CHOOSE SERVER");
@@ -576,29 +576,29 @@ int Client::exec()
                     // Allow changing this using a server choice dialog
                     // We show the dialog box only if the command-line
                     // options weren't set.
-                    if (options.serverName.empty() && options.serverPort == 0)
+                    if (mOptions.serverName.empty() && mOptions.serverPort == 0)
                     {
                         // Don't allow an alpha opacity
                         // lower than the default value
                         SkinLoader::instance()->setMinimumOpacity(0.8f);
 
-                        currentDialog = new ServerDialog(&currentServer,
-                                                         configDir);
+                        mCurrentDialog = new ServerDialog(&mCurrentServer,
+                                                         mConfigDir);
                     }
                     else
                     {
-                        state = STATE_CONNECT_SERVER;
+                        mState = STATE_CONNECT_SERVER;
 
                         // Reset options so that cancelling or connect
                         // timeout will show the server dialog.
-                        options.serverName.clear();
-                        options.serverPort = 0;
+                        mOptions.serverName.clear();
+                        mOptions.serverPort = 0;
                     }
                     break;
 
                 case STATE_CONNECT_SERVER:
                     logger->log("State: CONNECT SERVER");
-                    currentDialog = new ConnectionDialog(
+                    mCurrentDialog = new ConnectionDialog(
                             _("Connecting to server"), STATE_SWITCH_SERVER);
                     break;
 
@@ -608,24 +608,24 @@ int Client::exec()
                     // lower than the default value
                     SkinLoader::instance()->setMinimumOpacity(0.8f);
 
-                    if (options.username.empty()
-                            || options.password.empty())
+                    if (mOptions.username.empty()
+                            || mOptions.password.empty())
                     {
-                        currentDialog = new LoginDialog(&loginData);
+                        mCurrentDialog = new LoginDialog(&loginData);
                     }
                     else
                     {
-                        state = STATE_LOGIN_ATTEMPT;
+                        mState = STATE_LOGIN_ATTEMPT;
                         // Clear the password so that when login fails, the
                         // dialog will show up next time.
-                        options.password.clear();
+                        mOptions.password.clear();
                     }
                     break;
 
                 case STATE_LOGIN_ATTEMPT:
                     logger->log("State: LOGIN ATTEMPT");
                     accountLogin(&loginData);
-                    currentDialog = new ConnectionDialog(
+                    mCurrentDialog = new ConnectionDialog(
                             _("Logging in"), STATE_SWITCH_SERVER);
                     break;
 
@@ -637,19 +637,19 @@ int Client::exec()
                         if (worlds.size() == 0)
                         {
                             // Trust that the netcode knows what it's doing
-                            state = STATE_UPDATE;
+                            mState = STATE_UPDATE;
                         }
                         else if (worlds.size() == 1)
                         {
                             Net::getLoginHandler()->chooseServer(0);
-                            state = STATE_UPDATE;
+                            mState = STATE_UPDATE;
                         }
                         else
                         {
-                            currentDialog = new WorldSelectDialog(worlds);
-                            if (options.chooseDefault)
+                            mCurrentDialog = new WorldSelectDialog(worlds);
+                            if (mOptions.chooseDefault)
                             {
-                                ((WorldSelectDialog*) currentDialog)->action(
+                                ((WorldSelectDialog*) mCurrentDialog)->action(
                                     gcn::ActionEvent(NULL, "ok"));
                             }
                         }
@@ -658,27 +658,27 @@ int Client::exec()
 
                 case STATE_WORLD_SELECT_ATTEMPT:
                     logger->log("State: WORLD SELECT ATTEMPT");
-                    currentDialog = new ConnectionDialog(
+                    mCurrentDialog = new ConnectionDialog(
                             _("Entering game world"), STATE_WORLD_SELECT);
                     break;
 
                 case STATE_UPDATE:
                     // Determine which source to use for the update host
-                    if (!options.updateHost.empty())
-                        updateHost = options.updateHost;
+                    if (!mOptions.updateHost.empty())
+                        mUpdateHost = mOptions.updateHost;
                     else
-                        updateHost = loginData.updateHost;
+                        mUpdateHost = loginData.updateHost;
                     initUpdatesDir();
 
-                    if (options.skipUpdate)
+                    if (mOptions.skipUpdate)
                     {
-                        state = STATE_LOAD_DATA;
+                        mState = STATE_LOAD_DATA;
                     }
                     else
                     {
                         logger->log("State: UPDATE");
-                        currentDialog = new UpdaterWindow(updateHost,
-                                localDataDir + "/" + updatesDir,options.dataPath.empty());
+                        mCurrentDialog = new UpdaterWindow(mUpdateHost,
+                                mLocalDataDir + "/" + mUpdatesDir,mOptions.dataPath.empty());
                     }
                     break;
 
@@ -687,7 +687,7 @@ int Client::exec()
 
                     // If another data path has been set,
                     // we don't load any other files...
-                    if (options.dataPath.empty())
+                    if (mOptions.dataPath.empty())
                     {
                         // Add customdata directory
                         ResourceManager::getInstance()->searchAndAddArchives(
@@ -706,15 +706,15 @@ int Client::exec()
                     StatusEffect::load();
                     Units::loadUnits();
 
-                    desktop->reloadWallpaper();
+                    mDesktop->reloadWallpaper();
 
-                    state = STATE_GET_CHARACTERS;
+                    mState = STATE_GET_CHARACTERS;
                     break;
 
                 case STATE_GET_CHARACTERS:
                     logger->log("State: GET CHARACTERS");
                     Net::getCharHandler()->requestCharacters();
-                    currentDialog = new ConnectionDialog(
+                    mCurrentDialog = new ConnectionDialog(
                             _("Requesting characters"),
                             STATE_SWITCH_SERVER);
                     break;
@@ -725,14 +725,14 @@ int Client::exec()
                     // lower than the default value
                     SkinLoader::instance()->setMinimumOpacity(0.8f);
 
-                    currentDialog = new CharSelectDialog(&loginData);
+                    mCurrentDialog = new CharSelectDialog(&loginData);
 
-                    if (!((CharSelectDialog*) currentDialog)->selectByName(
-                            options.character, CharSelectDialog::Choose))
+                    if (!((CharSelectDialog*) mCurrentDialog)->selectByName(
+                            mOptions.character, CharSelectDialog::Choose))
                     {
-                        ((CharSelectDialog*) currentDialog)->selectByName(
+                        ((CharSelectDialog*) mCurrentDialog)->selectByName(
                                 config.getValue("lastCharacter", ""),
-                                options.chooseDefault ?
+                                mOptions.chooseDefault ?
                                     CharSelectDialog::Choose :
                                     CharSelectDialog::Focus);
                     }
@@ -743,7 +743,7 @@ int Client::exec()
                     logger->log("State: CONNECT GAME");
 
                     Net::getGameHandler()->connect();
-                    currentDialog = new ConnectionDialog(
+                    mCurrentDialog = new ConnectionDialog(
                             _("Connecting to the game server"),
                             STATE_SWITCH_CHARACTER);
                     break;
@@ -762,12 +762,12 @@ int Client::exec()
                     // Allow any alpha opacity
                     SkinLoader::instance()->setMinimumOpacity(-1.0f);
 
-                    delete setupButton;
-                    delete desktop;
-                    setupButton = NULL;
-                    desktop = NULL;
+                    delete mSetupButton;
+                    delete mDesktop;
+                    mSetupButton = NULL;
+                    mDesktop = NULL;
 
-                    currentDialog = NULL;
+                    mCurrentDialog = NULL;
 
                     logger->log("State: GAME");
                     game = new Game;
@@ -775,28 +775,28 @@ int Client::exec()
 
                 case STATE_LOGIN_ERROR:
                     logger->log("State: LOGIN ERROR");
-                    currentDialog = new OkDialog(_("Error"), errorMessage);
-                    currentDialog->addActionListener(&loginListener);
-                    currentDialog = NULL; // OkDialog deletes itself
+                    mCurrentDialog = new OkDialog(_("Error"), errorMessage);
+                    mCurrentDialog->addActionListener(&loginListener);
+                    mCurrentDialog = NULL; // OkDialog deletes itself
                     break;
 
                 case STATE_ACCOUNTCHANGE_ERROR:
                     logger->log("State: ACCOUNT CHANGE ERROR");
-                    currentDialog = new OkDialog(_("Error"), errorMessage);
-                    currentDialog->addActionListener(&accountListener);
-                    currentDialog = NULL; // OkDialog deletes itself
+                    mCurrentDialog = new OkDialog(_("Error"), errorMessage);
+                    mCurrentDialog->addActionListener(&accountListener);
+                    mCurrentDialog = NULL; // OkDialog deletes itself
                     break;
 
                 case STATE_REGISTER_PREP:
                     logger->log("State: REGISTER_PREP");
                     Net::getLoginHandler()->getRegistrationDetails();
-                    currentDialog = new ConnectionDialog(
+                    mCurrentDialog = new ConnectionDialog(
                             _("Requesting registration details"), STATE_LOGIN);
                     break;
 
                 case STATE_REGISTER:
                     logger->log("State: REGISTER");
-                    currentDialog = new RegisterDialog(&loginData);
+                    mCurrentDialog = new RegisterDialog(&loginData);
                     break;
 
                 case STATE_REGISTER_ATTEMPT:
@@ -806,7 +806,7 @@ int Client::exec()
 
                 case STATE_CHANGEPASSWORD:
                     logger->log("State: CHANGE PASSWORD");
-                    currentDialog = new ChangePasswordDialog(&loginData);
+                    mCurrentDialog = new ChangePasswordDialog(&loginData);
                     break;
 
                 case STATE_CHANGEPASSWORD_ATTEMPT:
@@ -818,17 +818,17 @@ int Client::exec()
 
                 case STATE_CHANGEPASSWORD_SUCCESS:
                     logger->log("State: CHANGE PASSWORD SUCCESS");
-                    currentDialog = new OkDialog(_("Password Change"),
+                    mCurrentDialog = new OkDialog(_("Password Change"),
                             _("Password changed successfully!"));
-                    currentDialog->addActionListener(&accountListener);
-                    currentDialog = NULL; // OkDialog deletes itself
+                    mCurrentDialog->addActionListener(&accountListener);
+                    mCurrentDialog = NULL; // OkDialog deletes itself
                     loginData.password = loginData.newPassword;
                     loginData.newPassword = "";
                     break;
 
                 case STATE_CHANGEEMAIL:
                     logger->log("State: CHANGE EMAIL");
-                    currentDialog = new ChangeEmailDialog(&loginData);
+                    mCurrentDialog = new ChangeEmailDialog(&loginData);
                     break;
 
                 case STATE_CHANGEEMAIL_ATTEMPT:
@@ -838,15 +838,15 @@ int Client::exec()
 
                 case STATE_CHANGEEMAIL_SUCCESS:
                     logger->log("State: CHANGE EMAIL SUCCESS");
-                    currentDialog = new OkDialog(_("Email Change"),
+                    mCurrentDialog = new OkDialog(_("Email Change"),
                             _("Email changed successfully!"));
-                    currentDialog->addActionListener(&accountListener);
-                    currentDialog = NULL; // OkDialog deletes itself
+                    mCurrentDialog->addActionListener(&accountListener);
+                    mCurrentDialog = NULL; // OkDialog deletes itself
                     break;
 
                 case STATE_UNREGISTER:
                     logger->log("State: UNREGISTER");
-                    currentDialog = new UnRegisterDialog(&loginData);
+                    mCurrentDialog = new UnRegisterDialog(&loginData);
                     break;
 
                 case STATE_UNREGISTER_ATTEMPT:
@@ -859,12 +859,12 @@ int Client::exec()
                     logger->log("State: UNREGISTER SUCCESS");
                     Net::getLoginHandler()->disconnect();
 
-                    currentDialog = new OkDialog(_("Unregister Successful"),
+                    mCurrentDialog = new OkDialog(_("Unregister Successful"),
                             _("Farewell, come back any time..."));
                     loginData.clear();
                     //The errorlistener sets the state to STATE_CHOOSE_SERVER
-                    currentDialog->addActionListener(&errorListener);
-                    currentDialog = NULL; // OkDialog deletes itself
+                    mCurrentDialog->addActionListener(&errorListener);
+                    mCurrentDialog = NULL; // OkDialog deletes itself
                     break;
 
                 case STATE_SWITCH_SERVER:
@@ -873,7 +873,7 @@ int Client::exec()
                     Net::getLoginHandler()->disconnect();
                     Net::getGameHandler()->disconnect();
 
-                    state = STATE_CHOOSE_SERVER;
+                    mState = STATE_CHOOSE_SERVER;
                     break;
 
                 case STATE_SWITCH_LOGIN:
@@ -881,7 +881,7 @@ int Client::exec()
 
                     Net::getLoginHandler()->logout();
 
-                    state = STATE_LOGIN;
+                    mState = STATE_LOGIN;
                     break;
 
                 case STATE_SWITCH_CHARACTER:
@@ -911,19 +911,19 @@ int Client::exec()
                     logger->log("State: FORCE QUIT");
                     if (Net::getGeneralHandler())
                         Net::getGeneralHandler()->unload();
-                    state = STATE_EXIT;
+                    mState = STATE_EXIT;
                   break;
 
                 case STATE_ERROR:
                     logger->log("State: ERROR");
-                    currentDialog = new OkDialog(_("Error"), errorMessage);
-                    currentDialog->addActionListener(&errorListener);
-                    currentDialog = NULL; // OkDialog deletes itself
+                    mCurrentDialog = new OkDialog(_("Error"), errorMessage);
+                    mCurrentDialog->addActionListener(&errorListener);
+                    mCurrentDialog = NULL; // OkDialog deletes itself
                     Net::getGameHandler()->disconnect();
                     break;
 
                 default:
-                    state = STATE_FORCE_QUIT;
+                    mState = STATE_FORCE_QUIT;
                     break;
             }
         }
@@ -961,9 +961,9 @@ void Client::action(const gcn::ActionEvent &event)
  */
 void Client::initHomeDir(const Options &options)
 {
-    localDataDir = options.localDataDir;
+    mLocalDataDir = options.localDataDir;
 
-    if (localDataDir.empty())
+    if (mLocalDataDir.empty())
     {
 #ifdef __APPLE__
         // Use Application Directory instead of .mana
@@ -976,20 +976,20 @@ void Client::initHomeDir(const Options &options)
             localDataDir = std::string(PHYSFS_getUserDir());
         localDataDir += "/Mana";
 #else
-        localDataDir = std::string(PHYSFS_getUserDir()) +
+        mLocalDataDir = std::string(PHYSFS_getUserDir()) +
             "/.local/share/mana";
 #endif
     }
 
-    if (mkdir_r(localDataDir.c_str()))
+    if (mkdir_r(mLocalDataDir.c_str()))
     {
         logger->error(strprintf(_("%s doesn't exist and can't be created! "
-                                  "Exiting."), localDataDir.c_str()));
+                                  "Exiting."), mLocalDataDir.c_str()));
     }
 
-    configDir = options.configDir;
+    mConfigDir = options.configDir;
 
-    if (configDir.empty()){
+    if (mConfigDir.empty()){
 #ifdef __APPLE__
         configDir = localDataDir;
 #elif defined WIN32
@@ -999,15 +999,15 @@ void Client::initHomeDir(const Options &options)
         else
             configDir += "/mana/" + branding.getValue("appName", "Mana");
 #else
-        configDir = std::string(PHYSFS_getUserDir()) +
+        mConfigDir = std::string(PHYSFS_getUserDir()) +
             "/.config/mana/" + branding.getValue("appShort", "mana");
 #endif
     }
 
-    if (mkdir_r(configDir.c_str()))
+    if (mkdir_r(mConfigDir.c_str()))
     {
         logger->error(strprintf(_("%s doesn't exist and can't be created! "
-                                  "Exiting."), configDir.c_str()));
+                                  "Exiting."), mConfigDir.c_str()));
     }
 }
 
@@ -1047,7 +1047,7 @@ void Client::initConfiguration(const Options &options)
     FILE *configFile = 0;
     std::string configPath;
 
-    configPath = configDir + "/config.xml";
+    configPath = mConfigDir + "/config.xml";
 
     configFile = fopen(configPath.c_str(), "r");
 
@@ -1077,47 +1077,47 @@ void Client::initUpdatesDir()
     std::stringstream updates;
 
     // If updatesHost is currently empty, fill it from config file
-    if (updateHost.empty())
+    if (mUpdateHost.empty())
     {
-        updateHost =
+        mUpdateHost =
             config.getValue("updatehost", "http://updates.themanaworld.org/");
     }
 
     // Remove any trailing slash at the end of the update host
-    if (updateHost.at(updateHost.size() - 1) == '/')
-        updateHost.resize(updateHost.size() - 1);
+    if (mUpdateHost.at(mUpdateHost.size() - 1) == '/')
+        mUpdateHost.resize(mUpdateHost.size() - 1);
 
     // Parse out any "http://" or "ftp://", and set the updates directory
     size_t pos;
-    pos = updateHost.find("://");
-    if (pos != updateHost.npos)
+    pos = mUpdateHost.find("://");
+    if (pos != mUpdateHost.npos)
     {
-        if (pos + 3 < updateHost.length())
+        if (pos + 3 < mUpdateHost.length())
         {
-            updates << "updates/" << updateHost.substr(pos + 3);
-            updatesDir = updates.str();
+            updates << "updates/" << mUpdateHost.substr(pos + 3);
+            mUpdatesDir = updates.str();
         }
         else
         {
-            logger->log("Error: Invalid update host: %s", updateHost.c_str());
+            logger->log("Error: Invalid update host: %s", mUpdateHost.c_str());
             errorMessage = strprintf(_("Invalid update host: %s"),
-                                     updateHost.c_str());
-            state = STATE_ERROR;
+                                     mUpdateHost.c_str());
+            mState = STATE_ERROR;
         }
     }
     else
     {
         logger->log("Warning: no protocol was specified for the update host");
-        updates << "updates/" << updateHost;
-        updatesDir = updates.str();
+        updates << "updates/" << mUpdateHost;
+        mUpdatesDir = updates.str();
     }
 
     ResourceManager *resman = ResourceManager::getInstance();
 
     // Verify that the updates directory exists. Create if necessary.
-    if (!resman->isDirectory("/" + updatesDir))
+    if (!resman->isDirectory("/" + mUpdatesDir))
     {
-        if (!resman->mkdir("/" + updatesDir))
+        if (!resman->mkdir("/" + mUpdatesDir))
         {
 #if defined WIN32
             std::string newDir = localDataDir + "\\" + updatesDir;
@@ -1139,9 +1139,9 @@ void Client::initUpdatesDir()
             }
 #else
             logger->log("Error: %s/%s can't be made, but doesn't exist!",
-                        localDataDir.c_str(), updatesDir.c_str());
+                        mLocalDataDir.c_str(), mUpdatesDir.c_str());
             errorMessage = _("Error creating updates directory!");
-            state = STATE_ERROR;
+            mState = STATE_ERROR;
 #endif
         }
     }
@@ -1150,13 +1150,13 @@ void Client::initUpdatesDir()
 void Client::initScreenshotDir(const std::string &dir)
 {
     if (!dir.empty())
-        screenshotDir = dir;
+        mScreenshotDir = dir;
     else
     {
         std::string configScreenshotDir =
             config.getValue("screenshotDirectory", "");
         if (!configScreenshotDir.empty())
-            screenshotDir = configScreenshotDir;
+            mScreenshotDir = configScreenshotDir;
         else
         {
 #ifdef WIN32
@@ -1164,14 +1164,14 @@ void Client::initScreenshotDir(const std::string &dir)
             if (screenshotDir.empty())
                 screenshotDir = getSpecialFolderLocation(CSIDL_DESKTOP);
 #else
-            screenshotDir = std::string(PHYSFS_getUserDir()) + "Desktop";
+            mScreenshotDir = std::string(PHYSFS_getUserDir()) + "Desktop";
             // If ~/Desktop does not exist, we save screenshots in the user's home.
             struct stat statbuf;
-            if (stat(screenshotDir.c_str(), &statbuf))
-                screenshotDir = std::string(PHYSFS_getUserDir());
+            if (stat(mScreenshotDir.c_str(), &statbuf))
+                mScreenshotDir = std::string(PHYSFS_getUserDir());
 #endif
         }
-        config.setValue("screenshotDirectory", screenshotDir);
+        config.setValue("screenshotDirectory", mScreenshotDir);
 
         if (config.getValue("useScreenshotDirectorySuffix", true))
         {
@@ -1181,19 +1181,19 @@ void Client::initScreenshotDir(const std::string &dir)
 
             if (!configScreenshotSuffix.empty())
             {
-                screenshotDir += "/" + configScreenshotSuffix;
+                mScreenshotDir += "/" + configScreenshotSuffix;
                 config.setValue("screenshotDirectorySuffix",
                                 configScreenshotSuffix);
             }
         }
     }
 
-    if (mkdir_r(screenshotDir.c_str()))
+    if (mkdir_r(mScreenshotDir.c_str()))
     {
         logger->log("Directory %s doesn't exist and can't be created! "
                     "Setting screenshot directory to home.",
-                    screenshotDir.c_str());
-        screenshotDir = std::string(PHYSFS_getUserDir());
+                    mScreenshotDir.c_str());
+        mScreenshotDir = std::string(PHYSFS_getUserDir());
     }
 }
 
diff --git a/src/client.h b/src/client.h
index f0fdd508..07910386 100644
--- a/src/client.h
+++ b/src/client.h
@@ -160,19 +160,19 @@ public:
     int exec();
 
     static void setState(State state)
-    { instance()->state = state; }
+    { instance()->mState = state; }
 
     static State getState()
-    { return instance()->state; }
+    { return instance()->mState; }
 
     static const std::string &getConfigDirectory()
-    { return instance()->configDir; }
+    { return instance()->mConfigDir; }
 
     static const std::string &getLocalDataDirectory()
-    { return instance()->localDataDir; }
+    { return instance()->mLocalDataDir; }
 
     static const std::string &getScreenshotDirectory()
-    { return instance()->screenshotDir; }
+    { return instance()->mScreenshotDir; }
 
     void optionChanged(const std::string &name);
     void action(const gcn::ActionEvent &event);
@@ -187,25 +187,25 @@ private:
 
     static Client *mInstance;
 
-    Options options;
+    Options mOptions;
 
-    std::string configDir;
-    std::string localDataDir;
-    std::string updateHost;
-    std::string updatesDir;
-    std::string screenshotDir;
+    std::string mConfigDir;
+    std::string mLocalDataDir;
+    std::string mUpdateHost;
+    std::string mUpdatesDir;
+    std::string mScreenshotDir;
 
-    ServerInfo currentServer;
+    ServerInfo mCurrentServer;
 
-    Window *currentDialog;
-    QuitDialog *quitDialog;
-    Desktop *desktop;
-    Button *setupButton;
+    Window *mCurrentDialog;
+    QuitDialog *mQuitDialog;
+    Desktop *mDesktop;
+    Button *mSetupButton;
 
-    State state;
-    State oldstate;
+    State mState;
+    State mOldState;
 
-    SDL_Surface *icon;
+    SDL_Surface *mIcon;
 
     SDL_TimerID mLogicCounterId;
     SDL_TimerID mSecondsCounterId;
-- 
cgit v1.2.3-70-g09d2


From 024ad66a350883597ba4c34d1c5868ef43c086a0 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Sat, 27 Feb 2010 17:42:13 +0100
Subject: Forgot to amend the last change with this

---
 src/client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index 722d8116..718556ad 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -192,7 +192,7 @@ public:
 Client *Client::mInstance = 0;
 
 Client::Client(const Options &options):
-    options(options),
+    mOptions(options),
     mCurrentDialog(0),
     mQuitDialog(0),
     mDesktop(0),
-- 
cgit v1.2.3-70-g09d2


From 2452f914c4997a49db34c30a9a6fb09ea5b7d958 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Sat, 27 Feb 2010 18:48:31 +0100
Subject: Corrected some variables names after recent renaming

With help from Jared.

Reviewed-by: Jared Adams
---
 src/client.cpp | 38 +++++++++++++++++++-------------------
 src/client.h   |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index 718556ad..c4a4dd63 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -291,7 +291,7 @@ Client::Client(const Options &options):
 #endif
 
 #ifdef USE_OPENGL
-    bool useOpenGL = !options.noOpenGL && (config.getValue("opengl", 0) == 1);
+    bool useOpenGL = !mOptions.noOpenGL && (config.getValue("opengl", 0) == 1);
 
     // Setup image loading for the right image format
     Image::setLoadAsOpenGL(useOpenGL);
@@ -967,14 +967,14 @@ void Client::initHomeDir(const Options &options)
     {
 #ifdef __APPLE__
         // Use Application Directory instead of .mana
-        localDataDir = std::string(PHYSFS_getUserDir()) +
+        mLocalDataDir = std::string(PHYSFS_getUserDir()) +
             "/Library/Application Support/" +
             branding.getValue("appName", "Mana");
 #elif defined WIN32
-        localDataDir = getSpecialFolderLocation(CSIDL_LOCAL_APPDATA);
-        if (localDataDir.empty())
-            localDataDir = std::string(PHYSFS_getUserDir());
-        localDataDir += "/Mana";
+        mLocalDataDir = getSpecialFolderLocation(CSIDL_LOCAL_APPDATA);
+        if (mLocalDataDir.empty())
+            mLocalDataDir = std::string(PHYSFS_getUserDir());
+        mLocalDataDir += "/Mana";
 #else
         mLocalDataDir = std::string(PHYSFS_getUserDir()) +
             "/.local/share/mana";
@@ -991,13 +991,13 @@ void Client::initHomeDir(const Options &options)
 
     if (mConfigDir.empty()){
 #ifdef __APPLE__
-        configDir = localDataDir;
+        mConfigDir = mLocalDataDir;
 #elif defined WIN32
-        configDir = getSpecialFolderLocation(CSIDL_APPDATA);
-        if (configDir.empty())
-            configDir = localDataDir;
+        mConfigDir = getSpecialFolderLocation(CSIDL_APPDATA);
+        if (mConfigDir.empty())
+            mConfigDir = mLocalDataDir;
         else
-            configDir += "/mana/" + branding.getValue("appName", "Mana");
+            mConfigDir += "/mana/" + branding.getValue("appName", "Mana");
 #else
         mConfigDir = std::string(PHYSFS_getUserDir()) +
             "/.config/mana/" + branding.getValue("appShort", "mana");
@@ -1014,7 +1014,7 @@ void Client::initHomeDir(const Options &options)
 /**
  * Initialize configuration.
  */
-void Client::initConfiguration(const Options &options)
+void Client::initConfiguration()
 {
     // Fill configuration with defaults
     logger->log("Initializing configuration...");
@@ -1052,12 +1052,12 @@ void Client::initConfiguration(const Options &options)
     configFile = fopen(configPath.c_str(), "r");
 
     // If we can't read it, it doesn't exist !
-    if (configFile == NULL)
+    if (!configFile)
     {
         // We reopen the file in write mode and we create it
         configFile = fopen(configPath.c_str(), "wt");
     }
-    if (configFile == NULL)
+    if (!configFile)
     {
        logger->log("Can't create %s. Using defaults.", configPath.c_str());
     }
@@ -1120,7 +1120,7 @@ void Client::initUpdatesDir()
         if (!resman->mkdir("/" + mUpdatesDir))
         {
 #if defined WIN32
-            std::string newDir = localDataDir + "\\" + updatesDir;
+            std::string newDir = mLocalDataDir + "\\" + mUpdatesDir;
             std::string::size_type loc = newDir.find("/", 0);
 
             while (loc != std::string::npos)
@@ -1135,7 +1135,7 @@ void Client::initUpdatesDir()
                 logger->log("Error: %s can't be made, but doesn't exist!",
                             newDir.c_str());
                 errorMessage = _("Error creating updates directory!");
-                state = STATE_ERROR;
+                mState = STATE_ERROR;
             }
 #else
             logger->log("Error: %s/%s can't be made, but doesn't exist!",
@@ -1160,9 +1160,9 @@ void Client::initScreenshotDir(const std::string &dir)
         else
         {
 #ifdef WIN32
-            screenshotDir = getSpecialFolderLocation(CSIDL_MYPICTURES);
-            if (screenshotDir.empty())
-                screenshotDir = getSpecialFolderLocation(CSIDL_DESKTOP);
+            mScreenshotDir = getSpecialFolderLocation(CSIDL_MYPICTURES);
+            if (mScreenshotDir.empty())
+                mScreenshotDir = getSpecialFolderLocation(CSIDL_DESKTOP);
 #else
             mScreenshotDir = std::string(PHYSFS_getUserDir()) + "Desktop";
             // If ~/Desktop does not exist, we save screenshots in the user's home.
diff --git a/src/client.h b/src/client.h
index 07910386..db9ed3a9 100644
--- a/src/client.h
+++ b/src/client.h
@@ -179,7 +179,7 @@ public:
 
 private:
     void initHomeDir(const Options &options);
-    void initConfiguration(const Options &options);
+    void initConfiguration();
     void initUpdatesDir();
     void initScreenshotDir(const std::string &dir);
 
-- 
cgit v1.2.3-70-g09d2


From 4f0ef07e85f408ebc8f33e2c573737a4ac2d29e1 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 27 Feb 2010 11:28:29 -0700
Subject: Some cleanup and compile fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Thorbjørn Lindeijer
---
 mana.files     | 15 ++++++---------
 src/client.cpp | 18 +++++++++---------
 src/client.h   |  4 ++--
 3 files changed, 17 insertions(+), 20 deletions(-)

(limited to 'src/client.cpp')

diff --git a/mana.files b/mana.files
index 8cba046c..ff28a90d 100644
--- a/mana.files
+++ b/mana.files
@@ -1,6 +1,5 @@
 ./CMakeLists.txt
 ./config.h
-./data/branding.xml
 ./data/CMakeLists.txt
 ./data/fonts/CMakeLists.txt
 ./data/fonts/Makefile.am
@@ -51,6 +50,8 @@
 ./src/channel.h
 ./src/channelmanager.cpp
 ./src/channelmanager.h
+./src/client.cpp
+./src/client.h
 ./src/CMakeLists.txt
 ./src/commandhandler.cpp
 ./src/commandhandler.h
@@ -101,8 +102,6 @@
 ./src/gui/focushandler.h
 ./src/gui/gui.cpp
 ./src/gui/gui.h
-./src/gui/guildwindow.cpp
-./src/gui/guildwindow.h
 ./src/gui/help.cpp
 ./src/gui/help.h
 ./src/gui/inventorywindow.cpp
@@ -207,8 +206,6 @@
 ./src/gui/widgets/emoteshortcutcontainer.h
 ./src/gui/widgets/flowcontainer.cpp
 ./src/gui/widgets/flowcontainer.h
-./src/gui/widgets/guildlistbox.cpp
-./src/gui/widgets/guildlistbox.h
 ./src/gui/widgets/icon.cpp
 ./src/gui/widgets/icon.h
 ./src/gui/widgets/inttextfield.cpp
@@ -284,8 +281,6 @@
 ./src/imageparticle.h
 ./src/inventory.cpp
 ./src/inventory.h
-./src/client.cpp
-./src/client.h
 ./src/item.cpp
 ./src/item.h
 ./src/itemshortcut.cpp
@@ -325,10 +320,10 @@
 ./src/net/ea/gamehandler.h
 ./src/net/ea/generalhandler.cpp
 ./src/net/ea/generalhandler.h
-./src/net/ea/guildhandler.cpp
-./src/net/ea/guildhandler.h
 ./src/net/ea/gui/guildtab.cpp
 ./src/net/ea/gui/guildtab.h
+./src/net/ea/guildhandler.cpp
+./src/net/ea/guildhandler.h
 ./src/net/ea/gui/partytab.cpp
 ./src/net/ea/gui/partytab.h
 ./src/net/ea/inventoryhandler.cpp
@@ -524,6 +519,8 @@
 ./src/utils/mutex.h
 ./src/utils/sha256.cpp
 ./src/utils/sha256.h
+./src/utils/specialfolder.cpp
+./src/utils/specialfolder.h
 ./src/utils/stringutils.cpp
 ./src/utils/stringutils.h
 ./src/utils/xml.cpp
diff --git a/src/client.cpp b/src/client.cpp
index c4a4dd63..8005a3ff 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -214,7 +214,7 @@ Client::Client(const Options &options):
         branding.init(options.brandingPath);
     }
 
-    initHomeDir(options);
+    initHomeDir();
 
     // Configure logger
     logger->setLogFile(mLocalDataDir + std::string("/mana.log"));
@@ -222,8 +222,8 @@ Client::Client(const Options &options):
     // Log the mana version
     logger->log("Mana %s", FULL_VERSION);
 
-    initConfiguration(options);
-    initScreenshotDir(options.screenshotDir);
+    initConfiguration();
+    initScreenshotDir();
 
     logger->setLogToStandardOut(config.getValue("logToStandardOut", 0));
 
@@ -959,9 +959,9 @@ void Client::action(const gcn::ActionEvent &event)
  * Initializes the home directory. On UNIX and FreeBSD, ~/.mana is used. On
  * Windows and other systems we use the current working directory.
  */
-void Client::initHomeDir(const Options &options)
+void Client::initHomeDir()
 {
-    mLocalDataDir = options.localDataDir;
+    mLocalDataDir = mOptions.localDataDir;
 
     if (mLocalDataDir.empty())
     {
@@ -987,7 +987,7 @@ void Client::initHomeDir(const Options &options)
                                   "Exiting."), mLocalDataDir.c_str()));
     }
 
-    mConfigDir = options.configDir;
+    mConfigDir = mOptions.configDir;
 
     if (mConfigDir.empty()){
 #ifdef __APPLE__
@@ -1147,10 +1147,10 @@ void Client::initUpdatesDir()
     }
 }
 
-void Client::initScreenshotDir(const std::string &dir)
+void Client::initScreenshotDir()
 {
-    if (!dir.empty())
-        mScreenshotDir = dir;
+    if (!mOptions.screenshotDir.empty())
+        mScreenshotDir = mOptions.screenshotDir;
     else
     {
         std::string configScreenshotDir =
diff --git a/src/client.h b/src/client.h
index db9ed3a9..934ba9d2 100644
--- a/src/client.h
+++ b/src/client.h
@@ -178,10 +178,10 @@ public:
     void action(const gcn::ActionEvent &event);
 
 private:
-    void initHomeDir(const Options &options);
+    void initHomeDir();
     void initConfiguration();
     void initUpdatesDir();
-    void initScreenshotDir(const std::string &dir);
+    void initScreenshotDir();
 
     void accountLogin(LoginData *loginData);
 
-- 
cgit v1.2.3-70-g09d2


From 1eea559d70d8ca49341bdd1648969468970e0db4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 27 Feb 2010 21:34:43 +0200
Subject: Fix program exit on windows.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
---
 src/client.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index 8005a3ff..9be7d0df 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -199,6 +199,7 @@ Client::Client(const Options &options):
     mSetupButton(0),
     mState(STATE_CHOOSE_SERVER),
     mOldState(STATE_START),
+    mIcon(0),
     mLogicCounterId(0),
     mSecondsCounterId(0),
     mLimitFps(false)
-- 
cgit v1.2.3-70-g09d2


From c44ee963f756cdac87e9ab739fc7e43aab70ad2d Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Sun, 28 Feb 2010 12:43:02 +0100
Subject: Avoid sending log output to the console on startup

By initializing the configuration before starting to log, so that we can
take into account the logToStandardOut setting.

Reviewed-by: Jared Adams
---
 src/client.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index 9be7d0df..9fa61364 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -216,18 +216,17 @@ Client::Client(const Options &options):
     }
 
     initHomeDir();
+    initConfiguration();
 
     // Configure logger
     logger->setLogFile(mLocalDataDir + std::string("/mana.log"));
+    logger->setLogToStandardOut(config.getValue("logToStandardOut", 0));
 
     // Log the mana version
     logger->log("Mana %s", FULL_VERSION);
 
-    initConfiguration();
     initScreenshotDir();
 
-    logger->setLogToStandardOut(config.getValue("logToStandardOut", 0));
-
     // Initialize SDL
     logger->log("Initializing SDL...");
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0)
@@ -1018,7 +1017,6 @@ void Client::initHomeDir()
 void Client::initConfiguration()
 {
     // Fill configuration with defaults
-    logger->log("Initializing configuration...");
     std::string defaultHost = branding.getValue("defaultServer",
         "server.themanaworld.org");
     int defaultPort = (int) branding.getValue("defaultPort", DEFAULT_PORT);
-- 
cgit v1.2.3-70-g09d2


From 500ee24e22aae7b457118d152b4480e99969092e Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 27 Feb 2010 21:50:25 -0700
Subject: Make the gui more themeable and distribute two themes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The older gray theme and the new wood theme are available as themes.
The gray theme needs some new graphics for hilights.

Add a theme option for branding and add path/to/branding/data to the
PhysFS search path.

Reviewed-by: Thorbjørn Lindeijer
Reviewed-by: Chuck Miller
---
 data/graphics/gui/button.png                  | Bin 1463 -> 374 bytes
 data/graphics/gui/button_disabled.png         | Bin 1463 -> 313 bytes
 data/graphics/gui/buttonhi.png                | Bin 1530 -> 374 bytes
 data/graphics/gui/buttonpress.png             | Bin 1558 -> 377 bytes
 data/graphics/gui/checkbox.png                | Bin 537 -> 696 bytes
 data/graphics/gui/close_button.png            | Bin 769 -> 650 bytes
 data/graphics/gui/deepbox.png                 | Bin 560 -> 219 bytes
 data/graphics/gui/gui.xml                     |  19 +++---
 data/graphics/gui/hscroll_left_default.png    | Bin 478 -> 358 bytes
 data/graphics/gui/hscroll_left_highlight.png  | Bin 479 -> 364 bytes
 data/graphics/gui/hscroll_left_pressed.png    | Bin 470 -> 349 bytes
 data/graphics/gui/hscroll_right_default.png   | Bin 444 -> 340 bytes
 data/graphics/gui/hscroll_right_highlight.png | Bin 484 -> 359 bytes
 data/graphics/gui/hscroll_right_pressed.png   | Bin 468 -> 350 bytes
 data/graphics/gui/item_shortcut_bgr.png       | Bin 1463 -> 284 bytes
 data/graphics/gui/radioin.png                 | Bin 636 -> 454 bytes
 data/graphics/gui/radioout.png                | Bin 528 -> 380 bytes
 data/graphics/gui/resize.png                  | Bin 670 -> 443 bytes
 data/graphics/gui/selection.png               | Bin 739 -> 740 bytes
 data/graphics/gui/slider.png                  | Bin 486 -> 485 bytes
 data/graphics/gui/sticky_button.png           | Bin 746 -> 526 bytes
 data/graphics/gui/tab.png                     | Bin 1352 -> 329 bytes
 data/graphics/gui/tabselected.png             | Bin 1437 -> 313 bytes
 data/graphics/gui/vscroll_down_default.png    | Bin 489 -> 367 bytes
 data/graphics/gui/vscroll_down_highlight.png  | Bin 486 -> 382 bytes
 data/graphics/gui/vscroll_down_pressed.png    | Bin 475 -> 376 bytes
 data/graphics/gui/vscroll_grey.png            | Bin 436 -> 338 bytes
 data/graphics/gui/vscroll_up_default.png      | Bin 484 -> 377 bytes
 data/graphics/gui/vscroll_up_highlight.png    | Bin 481 -> 376 bytes
 data/graphics/gui/vscroll_up_pressed.png      | Bin 462 -> 364 bytes
 data/graphics/gui/window.png                  | Bin 25969 -> 3410 bytes
 docs/example.mana                             |   1 +
 src/client.cpp                                |  43 +++++++++++---
 src/client.h                                  |   4 ++
 src/gui/emotepopup.cpp                        |   6 +-
 src/gui/gui.cpp                               |   5 +-
 src/gui/skilldialog.cpp                       |   3 +-
 src/gui/skin.cpp                              |  80 ++++++++++++++++++++++++--
 src/gui/skin.h                                |  19 +++++-
 src/gui/specialswindow.cpp                    |   3 +-
 src/gui/speechbubble.cpp                      |   3 +-
 src/gui/widgets/avatarlistbox.cpp             |   5 +-
 src/gui/widgets/button.cpp                    |  12 ++--
 src/gui/widgets/checkbox.cpp                  |   4 +-
 src/gui/widgets/dropdown.cpp                  |  12 ++--
 src/gui/widgets/emoteshortcutcontainer.cpp    |   6 +-
 src/gui/widgets/itemcontainer.cpp             |   6 +-
 src/gui/widgets/itemshortcutcontainer.cpp     |   6 +-
 src/gui/widgets/playerbox.cpp                 |   6 +-
 src/gui/widgets/popup.h                       |   2 +-
 src/gui/widgets/progressbar.cpp               |   4 +-
 src/gui/widgets/progressindicator.cpp         |   7 ++-
 src/gui/widgets/radiobutton.cpp               |  16 +++---
 src/gui/widgets/resizegrip.cpp                |   6 +-
 src/gui/widgets/resizegrip.h                  |   2 +-
 src/gui/widgets/scrollarea.cpp                |  24 ++++----
 src/gui/widgets/slider.cpp                    |   6 +-
 src/gui/widgets/tab.cpp                       |  12 ++--
 src/gui/widgets/textfield.cpp                 |   4 +-
 src/gui/widgets/window.h                      |   2 +-
 src/item.cpp                                  |   6 +-
 src/localplayer.cpp                           |  24 +++-----
 src/resources/resourcemanager.cpp             |   3 +-
 src/text.cpp                                  |   4 +-
 64 files changed, 229 insertions(+), 136 deletions(-)

(limited to 'src/client.cpp')

diff --git a/data/graphics/gui/button.png b/data/graphics/gui/button.png
index 4f6a5a81..9ebbea63 100644
Binary files a/data/graphics/gui/button.png and b/data/graphics/gui/button.png differ
diff --git a/data/graphics/gui/button_disabled.png b/data/graphics/gui/button_disabled.png
index 2a8fdf43..0ce3aa6f 100644
Binary files a/data/graphics/gui/button_disabled.png and b/data/graphics/gui/button_disabled.png differ
diff --git a/data/graphics/gui/buttonhi.png b/data/graphics/gui/buttonhi.png
index 24c09718..c4772634 100644
Binary files a/data/graphics/gui/buttonhi.png and b/data/graphics/gui/buttonhi.png differ
diff --git a/data/graphics/gui/buttonpress.png b/data/graphics/gui/buttonpress.png
index d192534a..e9cd1765 100644
Binary files a/data/graphics/gui/buttonpress.png and b/data/graphics/gui/buttonpress.png differ
diff --git a/data/graphics/gui/checkbox.png b/data/graphics/gui/checkbox.png
index b68893fc..669ecf03 100644
Binary files a/data/graphics/gui/checkbox.png and b/data/graphics/gui/checkbox.png differ
diff --git a/data/graphics/gui/close_button.png b/data/graphics/gui/close_button.png
index a4f802e0..f87cc2a9 100644
Binary files a/data/graphics/gui/close_button.png and b/data/graphics/gui/close_button.png differ
diff --git a/data/graphics/gui/deepbox.png b/data/graphics/gui/deepbox.png
index 6b63168a..084b5f61 100644
Binary files a/data/graphics/gui/deepbox.png and b/data/graphics/gui/deepbox.png differ
diff --git a/data/graphics/gui/gui.xml b/data/graphics/gui/gui.xml
index 015c6ce3..f27dbc7f 100644
--- a/data/graphics/gui/gui.xml
+++ b/data/graphics/gui/gui.xml
@@ -1,19 +1,18 @@
 <skinset name="Default" image="window.png">
 	<widget type="Window">
-		<!-- <option name="padding" value="5" /> --> 
 		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+		<part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
+		<part type="top-edge" xpos="4" ypos="0" width="32" height="4" />
+		<part type="top-right-corner" xpos="36" ypos="0" width="4" height="4" />
 
 		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+		<part type="left-edge" xpos="0" ypos="4" width="4" height="216" />
+		<part type="bg-quad" xpos="4" ypos="4" width="32" height="216" />
+		<part type="right-edge" xpos="36" ypos="4" width="4" height="216" />
 
 		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+		<part type="bottom-left-corner" xpos="0" ypos="220" width="4" height="4" />
+		<part type="bottom-edge" xpos="4" ypos="220" width="32" height="4" />
+		<part type="bottom-right-corner" xpos="36" ypos="220" width="4" height="4" />
 	</widget>
 </skinset>
diff --git a/data/graphics/gui/hscroll_left_default.png b/data/graphics/gui/hscroll_left_default.png
index 07e5e078..2f763d30 100644
Binary files a/data/graphics/gui/hscroll_left_default.png and b/data/graphics/gui/hscroll_left_default.png differ
diff --git a/data/graphics/gui/hscroll_left_highlight.png b/data/graphics/gui/hscroll_left_highlight.png
index c77427f8..6be5ae25 100644
Binary files a/data/graphics/gui/hscroll_left_highlight.png and b/data/graphics/gui/hscroll_left_highlight.png differ
diff --git a/data/graphics/gui/hscroll_left_pressed.png b/data/graphics/gui/hscroll_left_pressed.png
index 081eaa3a..b8ebcb46 100644
Binary files a/data/graphics/gui/hscroll_left_pressed.png and b/data/graphics/gui/hscroll_left_pressed.png differ
diff --git a/data/graphics/gui/hscroll_right_default.png b/data/graphics/gui/hscroll_right_default.png
index ee74c071..33fdddd0 100644
Binary files a/data/graphics/gui/hscroll_right_default.png and b/data/graphics/gui/hscroll_right_default.png differ
diff --git a/data/graphics/gui/hscroll_right_highlight.png b/data/graphics/gui/hscroll_right_highlight.png
index 9f8911e4..e9e633ea 100644
Binary files a/data/graphics/gui/hscroll_right_highlight.png and b/data/graphics/gui/hscroll_right_highlight.png differ
diff --git a/data/graphics/gui/hscroll_right_pressed.png b/data/graphics/gui/hscroll_right_pressed.png
index 6ef987a5..53972f2b 100644
Binary files a/data/graphics/gui/hscroll_right_pressed.png and b/data/graphics/gui/hscroll_right_pressed.png differ
diff --git a/data/graphics/gui/item_shortcut_bgr.png b/data/graphics/gui/item_shortcut_bgr.png
index 5b3c5e7c..0543e38a 100644
Binary files a/data/graphics/gui/item_shortcut_bgr.png and b/data/graphics/gui/item_shortcut_bgr.png differ
diff --git a/data/graphics/gui/radioin.png b/data/graphics/gui/radioin.png
index 8d0e5f74..12e027fe 100644
Binary files a/data/graphics/gui/radioin.png and b/data/graphics/gui/radioin.png differ
diff --git a/data/graphics/gui/radioout.png b/data/graphics/gui/radioout.png
index 70a25256..5eb67bd8 100644
Binary files a/data/graphics/gui/radioout.png and b/data/graphics/gui/radioout.png differ
diff --git a/data/graphics/gui/resize.png b/data/graphics/gui/resize.png
index dfe79ebf..6b31ac64 100644
Binary files a/data/graphics/gui/resize.png and b/data/graphics/gui/resize.png differ
diff --git a/data/graphics/gui/selection.png b/data/graphics/gui/selection.png
index a117a78a..78827daf 100644
Binary files a/data/graphics/gui/selection.png and b/data/graphics/gui/selection.png differ
diff --git a/data/graphics/gui/slider.png b/data/graphics/gui/slider.png
index df9abe56..465ad0e8 100644
Binary files a/data/graphics/gui/slider.png and b/data/graphics/gui/slider.png differ
diff --git a/data/graphics/gui/sticky_button.png b/data/graphics/gui/sticky_button.png
index 2708dd99..8c570573 100644
Binary files a/data/graphics/gui/sticky_button.png and b/data/graphics/gui/sticky_button.png differ
diff --git a/data/graphics/gui/tab.png b/data/graphics/gui/tab.png
index 689981a9..91eadf08 100644
Binary files a/data/graphics/gui/tab.png and b/data/graphics/gui/tab.png differ
diff --git a/data/graphics/gui/tabselected.png b/data/graphics/gui/tabselected.png
index 72a48973..e2983060 100644
Binary files a/data/graphics/gui/tabselected.png and b/data/graphics/gui/tabselected.png differ
diff --git a/data/graphics/gui/vscroll_down_default.png b/data/graphics/gui/vscroll_down_default.png
index 0ec2a3ee..c4292489 100644
Binary files a/data/graphics/gui/vscroll_down_default.png and b/data/graphics/gui/vscroll_down_default.png differ
diff --git a/data/graphics/gui/vscroll_down_highlight.png b/data/graphics/gui/vscroll_down_highlight.png
index d2934daa..ac88f7c7 100644
Binary files a/data/graphics/gui/vscroll_down_highlight.png and b/data/graphics/gui/vscroll_down_highlight.png differ
diff --git a/data/graphics/gui/vscroll_down_pressed.png b/data/graphics/gui/vscroll_down_pressed.png
index 6aa44ba6..9dcc89f6 100644
Binary files a/data/graphics/gui/vscroll_down_pressed.png and b/data/graphics/gui/vscroll_down_pressed.png differ
diff --git a/data/graphics/gui/vscroll_grey.png b/data/graphics/gui/vscroll_grey.png
index 3f65a883..f99da467 100644
Binary files a/data/graphics/gui/vscroll_grey.png and b/data/graphics/gui/vscroll_grey.png differ
diff --git a/data/graphics/gui/vscroll_up_default.png b/data/graphics/gui/vscroll_up_default.png
index 73a4266f..1cecc351 100644
Binary files a/data/graphics/gui/vscroll_up_default.png and b/data/graphics/gui/vscroll_up_default.png differ
diff --git a/data/graphics/gui/vscroll_up_highlight.png b/data/graphics/gui/vscroll_up_highlight.png
index 6fc3884d..7b5009f3 100644
Binary files a/data/graphics/gui/vscroll_up_highlight.png and b/data/graphics/gui/vscroll_up_highlight.png differ
diff --git a/data/graphics/gui/vscroll_up_pressed.png b/data/graphics/gui/vscroll_up_pressed.png
index bfa8e175..2320ec42 100644
Binary files a/data/graphics/gui/vscroll_up_pressed.png and b/data/graphics/gui/vscroll_up_pressed.png differ
diff --git a/data/graphics/gui/window.png b/data/graphics/gui/window.png
index 671b7740..f0ef1af4 100644
Binary files a/data/graphics/gui/window.png and b/data/graphics/gui/window.png differ
diff --git a/docs/example.mana b/docs/example.mana
index aa87b96f..9802c280 100644
--- a/docs/example.mana
+++ b/docs/example.mana
@@ -19,4 +19,5 @@ filename / path as a command line parameter
  <option name="defaultUpdateHost" value="http://updates.themanaworld.org"/>
  <option name="font" value="fonts/dejavusans.ttf" />
  <option name="boldFont" value="fonts/dejavusans-bold.ttf" />
+ <option name="theme" value="wood" />
 </configuration>
diff --git a/src/client.cpp b/src/client.cpp
index 9fa61364..a1b7a512 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -249,13 +249,6 @@ Client::Client(const Options &options):
                                 "Exiting.", mLocalDataDir.c_str()));
     }
 
-    // Add the local data directory to PhysicsFS search path
-    resman->addToSearchPath(mLocalDataDir, false);
-
-    // Add the main data directories to our PhysicsFS search path
-    if (!options.dataPath.empty())
-        resman->addToSearchPath(options.dataPath, true);
-    resman->addToSearchPath("data", true);
 #if defined __APPLE__
     CFBundleRef mainBundle = CFBundleGetMainBundle();
     CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
@@ -267,10 +260,40 @@ Client::Client(const Options &options):
     }
     CFRelease(resourcesURL);
     strncat(path, "/data", PATH_MAX - 1);
-    resman->addToSearchPath(path, true);
+    resman->addToSearchPath(path, false);
+    mPackageDir = path;
+#else
+    resman->addToSearchPath(PKG_DATADIR "data", false);
+    mPackageDir = PKG_DATADIR "data";
+#endif
+
+    resman->addToSearchPath("data", false);
+
+    // Add branding/data to PhysFS search path
+    if (!options.brandingPath.empty())
+    {
+        std::string path = options.brandingPath;
+
+        // Strip blah.mana from the path
+#ifdef WIN32
+        int loc1 = path.find_last_of('/');
+        int loc2 = path.find_last_of('\\');
+        int loc = std::max(loc1, loc2);
 #else
-    resman->addToSearchPath(PKG_DATADIR "data", true);
+        int loc = path.find_last_of('/');
 #endif
+        if (loc > 0)
+            path = path.substr(0, loc + 1);
+
+        resman->addToSearchPath(path + "data", false);
+    }
+
+    // Add the main data directories to our PhysicsFS search path
+    if (!options.dataPath.empty())
+        resman->addToSearchPath(options.dataPath, false);
+
+    // Add the local data directory to PhysicsFS search path
+    resman->addToSearchPath(mLocalDataDir, false);
 
 #ifdef WIN32
     static SDL_SysWMinfo pInfo;
@@ -319,6 +342,8 @@ Client::Client(const Options &options):
     // Initialize for drawing
     graphics->_beginDraw();
 
+    SkinLoader::prepareThemePath();
+
     // Initialize the item shortcuts.
     itemShortcut = new ItemShortcut;
 
diff --git a/src/client.h b/src/client.h
index 934ba9d2..233ee646 100644
--- a/src/client.h
+++ b/src/client.h
@@ -165,6 +165,9 @@ public:
     static State getState()
     { return instance()->mState; }
 
+    static const std::string &getPackageDirectory()
+    { return instance()->mPackageDir; }
+
     static const std::string &getConfigDirectory()
     { return instance()->mConfigDir; }
 
@@ -189,6 +192,7 @@ private:
 
     Options mOptions;
 
+    std::string mPackageDir;
     std::string mConfigDir;
     std::string mLocalDataDir;
     std::string mUpdateHost;
diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp
index 2711161e..e0c0a409 100644
--- a/src/gui/emotepopup.cpp
+++ b/src/gui/emotepopup.cpp
@@ -29,10 +29,11 @@
 #include "localplayer.h"
 #include "log.h"
 
+#include "gui/skin.h"
+
 #include "resources/emotedb.h"
 #include "resources/image.h"
 #include "resources/iteminfo.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 
@@ -56,8 +57,7 @@ EmotePopup::EmotePopup():
         mEmotes.push_back(EmoteDB::getAnimation(i));
     }
 
-    ResourceManager *resman = ResourceManager::getInstance();
-    mSelectionImage = resman->getImage("graphics/gui/selection.png");
+    mSelectionImage = SkinLoader::getImageFromTheme("selection.png");
     if (!mSelectionImage)
         logger->error("Unable to load selection.png");
 
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index e82a33b9..bc3eb675 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -209,9 +209,8 @@ void Gui::setUseCustomCursor(bool customCursor)
             SDL_ShowCursor(SDL_DISABLE);
 
             // Load the mouse cursor
-            ResourceManager *resman = ResourceManager::getInstance();
-            mMouseCursors =
-                resman->getImageSet("graphics/gui/mouse.png", 40, 40);
+            mMouseCursors = SkinLoader::getImageSetFromTheme("mouse.png",
+                                                             40, 40);
 
             if (!mMouseCursors)
                 logger->error("Unable to load mouse cursors.");
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 78c5c998..d53a1867 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -25,6 +25,7 @@
 #include "log.h"
 
 #include "gui/setup.h"
+#include "gui/skin.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/container.h"
@@ -85,7 +86,7 @@ struct SkillInfo
         }
         else
         {
-            icon = res->getImage("graphics/gui/unknown-item.png");
+            icon = SkinLoader::getImageFromTheme("unknown-item.png");
         }
     }
 
diff --git a/src/gui/skin.cpp b/src/gui/skin.cpp
index a682bf8f..22153720 100644
--- a/src/gui/skin.cpp
+++ b/src/gui/skin.cpp
@@ -23,22 +23,26 @@
 
 #include "gui/skin.h"
 
+#include "client.h"
 #include "configuration.h"
 #include "configlistener.h"
 #include "log.h"
 
 #include "resources/image.h"
+#include "resources/imageset.h"
 #include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 #include "utils/stringutils.h"
 #include "utils/xml.h"
 
+#include <physfs.h>
+
 #include <algorithm>
 
+std::string SkinLoader::mThemePath;
 SkinLoader *SkinLoader::mInstance = 0;
 
-
 class SkinConfigListener : public ConfigListener
 {
     public:
@@ -197,7 +201,7 @@ Skin *SkinLoader::readSkin(const std::string &filename)
 
     logger->log("Loading skin '%s'.", filename.c_str());
 
-    XML::Document doc(filename);
+    XML::Document doc(resolveThemePath(filename));
     xmlNodePtr rootNode = doc.rootNode();
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "skinset"))
@@ -215,8 +219,7 @@ Skin *SkinLoader::readSkin(const std::string &filename)
     logger->log("SkinLoader::load(): <skinset> defines "
                 "'%s' as a skin image.", skinSetImage.c_str());
 
-    ResourceManager *resman = ResourceManager::getInstance();
-    Image *dBorders = resman->getImage("graphics/gui/" + skinSetImage);
+    Image *dBorders = SkinLoader::getImageFromTheme(skinSetImage);
     ImageRect border;
 
     // iterate <widget>'s
@@ -286,8 +289,8 @@ Skin *SkinLoader::readSkin(const std::string &filename)
     logger->log("Finished loading skin.");
 
     // Hard-coded for now until we update the above code to look for window buttons
-    Image *closeImage = resman->getImage("graphics/gui/close_button.png");
-    Image *sticky = resman->getImage("graphics/gui/sticky_button.png");
+    Image *closeImage = SkinLoader::getImageFromTheme("close_button.png");
+    Image *sticky = SkinLoader::getImageFromTheme("sticky_button.png");
     Image *stickyImageUp = sticky->getSubImage(0, 0, 15, 15);
     Image *stickyImageDown = sticky->getSubImage(15, 0, 15, 15);
     sticky->decRef();
@@ -297,3 +300,68 @@ Skin *SkinLoader::readSkin(const std::string &filename)
     skin->updateAlpha(mMinimumOpacity);
     return skin;
 }
+
+bool SkinLoader::tryThemePath(std::string themePath)
+{
+    if (!themePath.empty())
+    {
+        themePath = "graphics/gui/" + themePath;
+        if (PHYSFS_exists(themePath.c_str()))
+        {
+            mThemePath = themePath;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void SkinLoader::prepareThemePath()
+{
+    // Try theme from settings
+    if (tryThemePath(config.getValue("theme", "")))
+        return;
+
+    // Try theme from branding
+    if (tryThemePath(branding.getValue("theme", "")))
+        return;
+
+    // Use default
+    mThemePath = "graphics/gui";
+}
+
+std::string SkinLoader::resolveThemePath(const std::string &path)
+{
+    // Need to strip off any dye info for the existence tests
+    int pos = path.find('|');
+    std::string file;
+    if (pos > 0)
+        file = path.substr(0, pos);
+    else
+        file = path;
+
+    // Might be a valid path already
+    if (PHYSFS_exists(file.c_str()))
+        return path;
+
+    // Try the theme
+    file = getThemePath() + "/" + file;
+    if (PHYSFS_exists(file.c_str()))
+        return getThemePath() + "/" + path;
+
+    // Backup
+    return "graphics/gui/" + path;
+}
+
+Image *SkinLoader::getImageFromTheme(const std::string &path)
+{
+    ResourceManager *resman = ResourceManager::getInstance();
+    return resman->getImage(resolveThemePath(path));
+}
+
+ImageSet *SkinLoader::getImageSetFromTheme(const std::string &path,
+                                        int w, int h)
+{
+    ResourceManager *resman = ResourceManager::getInstance();
+    return resman->getImageSet(resolveThemePath(path), w, h);
+}
diff --git a/src/gui/skin.h b/src/gui/skin.h
index 15d55972..091d3001 100644
--- a/src/gui/skin.h
+++ b/src/gui/skin.h
@@ -31,6 +31,7 @@
 
 class ConfigListener;
 class Image;
+class ImageSet;
 
 class Skin
 {
@@ -101,11 +102,24 @@ class SkinLoader
         static SkinLoader *instance();
         static void deleteInstance();
 
+        static void prepareThemePath();
+        static std::string getThemePath() { return mThemePath; }
+
+        /**
+         * Returns the patch to the given gui resource relative to the theme
+         * or, if it isn't in the theme, relative to 'graphics/gui'.
+         */
+        static std::string resolveThemePath(const std::string &path);
+
+        static Image *getImageFromTheme(const std::string &path);
+        static ImageSet *getImageSetFromTheme(const std::string &path,
+                                           int w, int h);
+
         /**
          * Loads a skin.
          */
         Skin *load(const std::string &filename,
-                   const std::string &defaultPath);
+                   const std::string &defaultPath = getThemePath());
 
         /**
          * Updates the alpha values of all of the skins.
@@ -141,8 +155,11 @@ class SkinLoader
          */
         ConfigListener *mSkinConfigListener;
 
+        static std::string mThemePath;
         static SkinLoader *mInstance;
 
+        static bool tryThemePath(std::string themePath);
+
         /**
          * Tells if the current skins opacity
          * should not get less than the given value
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index 1513dcf1..3ca0f037 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -24,6 +24,7 @@
 #include "log.h"
 
 #include "gui/setup.h"
+#include "gui/skin.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/container.h"
@@ -219,7 +220,7 @@ SpecialEntry::SpecialEntry(SpecialInfo *info) :
     if (!info->icon.empty())
         mIcon = new Icon(info->icon);
     else
-        mIcon = new Icon("graphics/gui/unknown-item.png");
+        mIcon = new Icon(SkinLoader::resolveThemePath("unknown-item.png"));
 
     mIcon->setPosition(1, 0);
     add(mIcon);
diff --git a/src/gui/speechbubble.cpp b/src/gui/speechbubble.cpp
index 3a87992b..f02965d1 100644
--- a/src/gui/speechbubble.cpp
+++ b/src/gui/speechbubble.cpp
@@ -25,6 +25,7 @@
 #include "graphics.h"
 
 #include "gui/gui.h"
+#include "gui/skin.h"
 
 #include "gui/widgets/textbox.h"
 
@@ -33,7 +34,7 @@
 #include <guichan/widgets/label.hpp>
 
 SpeechBubble::SpeechBubble():
-    Popup("Speech", "graphics/gui/speechbubble.xml")
+        Popup("Speech", "speechbubble.xml")
 {
     setContentSize(140, 46);
     setMinWidth(29);
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index f5a9ea18..92386739 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -25,6 +25,7 @@
 #include "gui/chat.h"
 #include "gui/gui.h"
 #include "gui/palette.h"
+#include "gui/skin.h"
 
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
@@ -44,8 +45,8 @@ AvatarListBox::AvatarListBox(AvatarListModel *model):
 
     if (instances == 1)
     {
-        onlineIcon = ResourceManager::getInstance()->getImage("graphics/gui/circle-green.png");
-        offlineIcon = ResourceManager::getInstance()->getImage("graphics/gui/circle-gray.png");
+        onlineIcon = SkinLoader::getImageFromTheme("circle-green.png");
+        offlineIcon = SkinLoader::getImageFromTheme("circle-gray.png");
     }
 
     setWidth(200);
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 6589c96e..36a47859 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -28,7 +28,6 @@
 #include "gui/skin.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 
@@ -54,10 +53,10 @@ struct ButtonData
 };
 
 static ButtonData const data[BUTTON_COUNT] = {
-    { "graphics/gui/button.png", 0, 0 },
-    { "graphics/gui/buttonhi.png", 9, 4 },
-    { "graphics/gui/buttonpress.png", 16, 19 },
-    { "graphics/gui/button_disabled.png", 25, 23 }
+    { "button.png", 0, 0 },
+    { "buttonhi.png", 9, 4 },
+    { "buttonpress.png", 16, 19 },
+    { "button_disabled.png", 25, 23 }
 };
 
 ImageRect Button::button[BUTTON_COUNT];
@@ -85,14 +84,13 @@ void Button::init()
     if (mInstances == 0)
     {
         // Load the skin
-        ResourceManager *resman = ResourceManager::getInstance();
         Image *btn[BUTTON_COUNT];
 
         int a, x, y, mode;
 
         for (mode = 0; mode < BUTTON_COUNT; mode++)
         {
-            btn[mode] = resman->getImage(data[mode].file);
+            btn[mode] = SkinLoader::getImageFromTheme(data[mode].file);
             a = 0;
             for (y = 0; y < 3; y++)
             {
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index dc6d94b3..d5253d7c 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -28,7 +28,6 @@
 #include "gui/skin.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 int CheckBox::instances = 0;
 float CheckBox::mAlpha = 1.0;
@@ -45,8 +44,7 @@ CheckBox::CheckBox(const std::string &caption, bool selected):
 {
     if (instances == 0)
     {
-        ResourceManager *resman = ResourceManager::getInstance();
-        Image *checkBox = resman->getImage("graphics/gui/checkbox.png");
+        Image *checkBox = SkinLoader::getImageFromTheme("checkbox.png");
         checkBoxNormal = checkBox->getSubImage(0, 0, 9, 10);
         checkBoxChecked = checkBox->getSubImage(9, 0, 9, 10);
         checkBoxDisabled = checkBox->getSubImage(18, 0, 9, 10);
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 32b42553..eb0cdef2 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -32,7 +32,6 @@
 #include "gui/widgets/scrollarea.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 
@@ -54,17 +53,16 @@ DropDown::DropDown(gcn::ListModel *listModel):
     if (instances == 0)
     {
         // Load the background skin
-        ResourceManager *resman = ResourceManager::getInstance();
 
         // Get the button skin
         buttons[1][0] =
-            resman->getImage("graphics/gui/vscroll_up_default.png");
+                SkinLoader::getImageFromTheme("vscroll_up_default.png");
         buttons[0][0] =
-            resman->getImage("graphics/gui/vscroll_down_default.png");
+                SkinLoader::getImageFromTheme("vscroll_down_default.png");
         buttons[1][1] =
-            resman->getImage("graphics/gui/vscroll_up_pressed.png");
+                SkinLoader::getImageFromTheme("vscroll_up_pressed.png");
         buttons[0][1] =
-            resman->getImage("graphics/gui/vscroll_down_pressed.png");
+                SkinLoader::getImageFromTheme("vscroll_down_pressed.png");
 
         buttons[0][0]->setAlpha(mAlpha);
         buttons[0][1]->setAlpha(mAlpha);
@@ -72,7 +70,7 @@ DropDown::DropDown(gcn::ListModel *listModel):
         buttons[1][1]->setAlpha(mAlpha);
 
         // get the border skin
-        Image *boxBorder = resman->getImage("graphics/gui/deepbox.png");
+        Image *boxBorder = SkinLoader::getImageFromTheme("deepbox.png");
         int gridx[4] = {0, 3, 28, 31};
         int gridy[4] = {0, 3, 28, 31};
         int a = 0, x, y;
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 41be172f..dd13c679 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -32,10 +32,10 @@
 #include "log.h"
 
 #include "gui/palette.h"
+#include "gui/skin.h"
 
 #include "resources/emotedb.h"
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 
@@ -49,9 +49,7 @@ EmoteShortcutContainer::EmoteShortcutContainer():
     addMouseListener(this);
     addWidgetListener(this);
 
-    ResourceManager *resman = ResourceManager::getInstance();
-
-    mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
+    mBackgroundImg = SkinLoader::getImageFromTheme("item_shortcut_bgr.png");
 
     mBackgroundImg->setAlpha(config.getValue("guialpha", 0.8));
 
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index f801822c..b4270912 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -32,6 +32,7 @@
 #include "gui/outfitwindow.h"
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
+#include "gui/skin.h"
 #include "gui/viewport.h"
 
 #include "net/net.h"
@@ -39,7 +40,6 @@
 
 #include "resources/image.h"
 #include "resources/iteminfo.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/stringutils.h"
 
@@ -67,9 +67,7 @@ ItemContainer::ItemContainer(Inventory *inventory, bool forceQuantity):
     mItemPopup = new ItemPopup;
     setFocusable(true);
 
-    ResourceManager *resman = ResourceManager::getInstance();
-
-    mSelImg = resman->getImage("graphics/gui/selection.png");
+    mSelImg = SkinLoader::getImageFromTheme("selection.png");
     if (!mSelImg)
         logger->error("Unable to load selection.png");
 
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 66e053d8..92a3e7d0 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -32,11 +32,11 @@
 #include "gui/inventorywindow.h"
 #include "gui/itempopup.h"
 #include "gui/palette.h"
+#include "gui/skin.h"
 #include "gui/viewport.h"
 
 #include "resources/image.h"
 #include "resources/iteminfo.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/stringutils.h"
 
@@ -50,9 +50,7 @@ ItemShortcutContainer::ItemShortcutContainer():
 
     mItemPopup = new ItemPopup;
 
-    ResourceManager *resman = ResourceManager::getInstance();
-
-    mBackgroundImg = resman->getImage("graphics/gui/item_shortcut_bgr.png");
+    mBackgroundImg = SkinLoader::getImageFromTheme("item_shortcut_bgr.png");
     mMaxItems = itemShortcut->getItemCount();
 
     mBackgroundImg->setAlpha(config.getValue("guialpha", 0.8));
diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp
index 23da2afd..24395db7 100644
--- a/src/gui/widgets/playerbox.cpp
+++ b/src/gui/widgets/playerbox.cpp
@@ -26,8 +26,9 @@
 #include "graphics.h"
 #include "player.h"
 
+#include "gui/skin.h"
+
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 
@@ -43,8 +44,7 @@ PlayerBox::PlayerBox(const Player *player):
     if (instances == 0)
     {
         // Load the background skin
-        ResourceManager *resman = ResourceManager::getInstance();
-        Image *textbox = resman->getImage("graphics/gui/deepbox.png");
+        Image *textbox = SkinLoader::getImageFromTheme("deepbox.png");
         int bggridx[4] = {0, 3, 28, 31};
         int bggridy[4] = {0, 3, 28, 31};
         int a = 0, x, y;
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 449c2f7b..d63b59ca 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -55,7 +55,7 @@ class Popup : public Container
          * @param skin    The location where the Popup's skin XML can be found.
          */
         Popup(const std::string &name = "",
-              const std::string &skin = "graphics/gui/gui.xml");
+              const std::string &skin = "gui.xml");
 
         /**
          * Destructor. Deletes all the added widgets.
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index db2a8692..31c32132 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -30,7 +30,6 @@
 #include "gui/skin.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 
@@ -59,8 +58,7 @@ ProgressBar::ProgressBar(float progress,
 
     if (mInstances == 0)
     {
-        ResourceManager *resman = ResourceManager::getInstance();
-        Image *dBorders = resman->getImage("graphics/gui/vscroll_grey.png");
+        Image *dBorders = SkinLoader::getImageFromTheme("vscroll_grey.png");
         mBorder.grid[0] = dBorders->getSubImage(0, 0, 4, 4);
         mBorder.grid[1] = dBorders->getSubImage(4, 0, 3, 4);
         mBorder.grid[2] = dBorders->getSubImage(7, 0, 4, 4);
diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp
index d1b6bb87..f88f6045 100644
--- a/src/gui/widgets/progressindicator.cpp
+++ b/src/gui/widgets/progressindicator.cpp
@@ -20,6 +20,8 @@
 
 #include "progressindicator.h"
 
+#include "gui/skin.h"
+
 #include "resources/animation.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
@@ -31,9 +33,8 @@
 
 ProgressIndicator::ProgressIndicator()
 {
-    ResourceManager *rm = ResourceManager::getInstance();
-    ImageSet *images = rm->getImageSet("graphics/gui/progress-indicator.png",
-                                       32, 32);
+    ImageSet *images =
+            SkinLoader::getImageSetFromTheme("progress-indicator.png", 32, 32);
 
     Animation *anim = new Animation;
     for (ImageSet::size_type i = 0; i < images->size(); ++i)
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index adbc4dd7..41c8faf7 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -24,8 +24,9 @@
 #include "configuration.h"
 #include "graphics.h"
 
+#include "gui/skin.h"
+
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 int RadioButton::instances = 0;
 float RadioButton::mAlpha = 1.0;
@@ -43,13 +44,12 @@ RadioButton::RadioButton(const std::string &caption, const std::string &group,
 {
     if (instances == 0)
     {
-        ResourceManager *resman = ResourceManager::getInstance();
-        radioNormal = resman->getImage("graphics/gui/radioout.png");
-        radioChecked = resman->getImage("graphics/gui/radioin.png");
-        radioDisabled = resman->getImage("graphics/gui/radioout.png");
-        radioDisabledChecked = resman->getImage("graphics/gui/radioin.png");
-        radioNormalHi = resman->getImage("graphics/gui/radioout_highlight.png");
-        radioCheckedHi = resman->getImage("graphics/gui/radioin_highlight.png");
+        radioNormal = SkinLoader::getImageFromTheme("radioout.png");
+        radioChecked = SkinLoader::getImageFromTheme("radioin.png");
+        radioDisabled = SkinLoader::getImageFromTheme("radioout.png");
+        radioDisabledChecked = SkinLoader::getImageFromTheme("radioin.png");
+        radioNormalHi = SkinLoader::getImageFromTheme("radioout_highlight.png");
+        radioCheckedHi = SkinLoader::getImageFromTheme("radioin_highlight.png");
         radioNormal->setAlpha(mAlpha);
         radioChecked->setAlpha(mAlpha);
         radioDisabled->setAlpha(mAlpha);
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index 106118da..d0b9b845 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -24,8 +24,9 @@
 #include "configuration.h"
 #include "graphics.h"
 
+#include "gui/skin.h"
+
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include <guichan/graphics.hpp>
 
@@ -38,8 +39,7 @@ ResizeGrip::ResizeGrip(const std::string &image)
     if (mInstances == 0)
     {
         // Load the grip image
-        ResourceManager *resman = ResourceManager::getInstance();
-        gripImage = resman->getImage(image);
+        gripImage = SkinLoader::getImageFromTheme(image);
         gripImage->setAlpha(mAlpha);
     }
 
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 4cc195cc..5ef93f29 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -39,7 +39,7 @@ class ResizeGrip : public gcn::Widget
         /**
          * Constructor.
          */
-        ResizeGrip(const std::string &image = "graphics/gui/resize.png");
+        ResizeGrip(const std::string &image = "resize.png");
 
         /**
          * Destructor.
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index b3e28329..dea99e8e 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -27,7 +27,6 @@
 #include "gui/skin.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 
@@ -96,8 +95,7 @@ void ScrollArea::init()
     if (instances == 0)
     {
         // Load the background skin
-        ResourceManager *resman = ResourceManager::getInstance();
-        Image *textbox = resman->getImage("graphics/gui/deepbox.png");
+        Image *textbox = SkinLoader::getImageFromTheme("deepbox.png");
         const int bggridx[4] = {0, 3, 28, 31};
         const int bggridy[4] = {0, 3, 28, 31};
         int a = 0, x, y;
@@ -118,8 +116,8 @@ void ScrollArea::init()
         textbox->decRef();
 
         // Load vertical scrollbar skin
-        Image *vscroll = resman->getImage("graphics/gui/vscroll_grey.png");
-        Image *vscrollHi = resman->getImage("graphics/gui/vscroll_highlight.png");
+        Image *vscroll = SkinLoader::getImageFromTheme("vscroll_grey.png");
+        Image *vscrollHi = SkinLoader::getImageFromTheme("vscroll_highlight.png");
 
         int vsgridx[4] = {0, 4, 7, 11};
         int vsgridy[4] = {0, 4, 15, 19};
@@ -147,21 +145,21 @@ void ScrollArea::init()
         vscrollHi->decRef();
 
         buttons[UP][0] =
-            resman->getImage("graphics/gui/vscroll_up_default.png");
+            SkinLoader::getImageFromTheme("vscroll_up_default.png");
         buttons[DOWN][0] =
-            resman->getImage("graphics/gui/vscroll_down_default.png");
+            SkinLoader::getImageFromTheme("vscroll_down_default.png");
         buttons[LEFT][0] =
-            resman->getImage("graphics/gui/hscroll_left_default.png");
+            SkinLoader::getImageFromTheme("hscroll_left_default.png");
         buttons[RIGHT][0] =
-            resman->getImage("graphics/gui/hscroll_right_default.png");
+            SkinLoader::getImageFromTheme("hscroll_right_default.png");
         buttons[UP][1] =
-            resman->getImage("graphics/gui/vscroll_up_pressed.png");
+            SkinLoader::getImageFromTheme("vscroll_up_pressed.png");
         buttons[DOWN][1] =
-            resman->getImage("graphics/gui/vscroll_down_pressed.png");
+            SkinLoader::getImageFromTheme("vscroll_down_pressed.png");
         buttons[LEFT][1] =
-            resman->getImage("graphics/gui/hscroll_left_pressed.png");
+            SkinLoader::getImageFromTheme("hscroll_left_pressed.png");
         buttons[RIGHT][1] =
-            resman->getImage("graphics/gui/hscroll_right_pressed.png");
+            SkinLoader::getImageFromTheme("hscroll_right_pressed.png");
     }
 
     instances++;
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index f02c6b5c..af36518a 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -27,7 +27,6 @@
 #include "gui/skin.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 Image *Slider::hStart, *Slider::hMid, *Slider::hEnd, *Slider::hGrip;
 Image *Slider::vStart, *Slider::vMid, *Slider::vEnd, *Slider::vGrip;
@@ -83,9 +82,8 @@ void Slider::init()
     // Load resources
     if (mInstances == 0)
     {
-        ResourceManager *resman = ResourceManager::getInstance();
-        Image *slider = resman->getImage("graphics/gui/slider.png");
-        Image *sliderHi = resman->getImage("graphics/gui/slider_hilight.png");
+        Image *slider = SkinLoader::getImageFromTheme("slider.png");
+        Image *sliderHi = SkinLoader::getImageFromTheme("slider_hilight.png");
 
         x = 0; y = 0;
         w = 15; h = 6;
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 68dc2190..17145eae 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -30,7 +30,6 @@
 #include "gui/widgets/tabbedarea.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 
@@ -55,10 +54,10 @@ struct TabData
 };
 
 static TabData const data[TAB_COUNT] = {
-    { "graphics/gui/tab.png", 0, 0 },
-    { "graphics/gui/tab_hilight.png", 9, 4 },
-    { "graphics/gui/tabselected.png", 16, 19 },
-    { "graphics/gui/tab.png", 25, 23 }
+    { "tab.png", 0, 0 },
+    { "tab_hilight.png", 9, 4 },
+    { "tabselected.png", 16, 19 },
+    { "tab.png", 25, 23 }
 };
 
 ImageRect Tab::tabImg[TAB_COUNT];
@@ -91,14 +90,13 @@ void Tab::init()
     if (mInstances == 0)
     {
         // Load the skin
-        ResourceManager *resman = ResourceManager::getInstance();
         Image *tab[TAB_COUNT];
 
         int a, x, y, mode;
 
         for (mode = 0; mode < TAB_COUNT; mode++)
         {
-            tab[mode] = resman->getImage(data[mode].file);
+            tab[mode] = SkinLoader::getImageFromTheme(data[mode].file);
             a = 0;
             for (y = 0; y < 3; y++)
             {
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 278b4cb9..e599c37d 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -29,7 +29,6 @@
 #include "gui/skin.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/copynpaste.h"
 #include "utils/dtor.h"
@@ -53,8 +52,7 @@ TextField::TextField(const std::string &text, bool loseFocusOnTab):
     if (instances == 0)
     {
         // Load the skin
-        ResourceManager *resman = ResourceManager::getInstance();
-        Image *textbox = resman->getImage("graphics/gui/deepbox.png");
+        Image *textbox = SkinLoader::getImageFromTheme("deepbox.png");
         int gridx[4] = {0, 3, 28, 31};
         int gridy[4] = {0, 3, 28, 31};
         int a = 0, x, y;
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index a54016bc..fd7fd6b7 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -57,7 +57,7 @@ class Window : public gcn::Window, gcn::WidgetListener
          * @param skin    The location where the window's skin XML can be found.
          */
         Window(const std::string &caption = "Window", bool modal = false,
-               Window *parent = NULL, const std::string &skin = "graphics/gui/gui.xml");
+               Window *parent = NULL, const std::string &skin = "gui.xml");
 
         /**
          * Destructor. Deletes all the added widgets.
diff --git a/src/item.cpp b/src/item.cpp
index e20ef57a..378c7efe 100644
--- a/src/item.cpp
+++ b/src/item.cpp
@@ -21,6 +21,8 @@
 
 #include "item.h"
 
+#include "gui/skin.h"
+
 #include "resources/image.h"
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
@@ -60,8 +62,8 @@ void Item::setId(int id)
     mDrawImage = resman->getImage(imagePath);
 
     if (!mImage)
-        mImage = resman->getImage("graphics/gui/unknown-item.png");
+        mImage = SkinLoader::getImageFromTheme("unknown-item.png");
 
     if (!mDrawImage)
-        mDrawImage = resman->getImage("graphics/gui/unknown-item.png");
+        mDrawImage = SkinLoader::getImageFromTheme("unknown-item.png");
 }
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 8ce03bba..750c8c45 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -43,6 +43,7 @@
 #include "gui/ministatus.h"
 #include "gui/palette.h"
 #include "gui/skilldialog.h"
+#include "gui/skin.h"
 #include "gui/statuswindow.h"
 #include "gui/storagewindow.h"
 
@@ -1050,18 +1051,12 @@ void LocalPlayer::handleStatusEffect(StatusEffect *effect, int effectId)
 void LocalPlayer::initTargetCursor()
 {
     // Load target cursors
-    loadTargetCursor("graphics/gui/target-cursor-blue-s.png", 44, 35,
-                     false, TC_SMALL);
-    loadTargetCursor("graphics/gui/target-cursor-red-s.png", 44, 35,
-                     true, TC_SMALL);
-    loadTargetCursor("graphics/gui/target-cursor-blue-m.png", 62, 44,
-                     false, TC_MEDIUM);
-    loadTargetCursor("graphics/gui/target-cursor-red-m.png", 62, 44,
-                     true, TC_MEDIUM);
-    loadTargetCursor("graphics/gui/target-cursor-blue-l.png", 82, 60,
-                     false, TC_LARGE);
-    loadTargetCursor("graphics/gui/target-cursor-red-l.png", 82, 60,
-                     true, TC_LARGE);
+    loadTargetCursor("target-cursor-blue-s.png", 44, 35, false, TC_SMALL);
+    loadTargetCursor("target-cursor-red-s.png", 44, 35, true, TC_SMALL);
+    loadTargetCursor("target-cursor-blue-m.png", 62, 44, false, TC_MEDIUM);
+    loadTargetCursor("target-cursor-red-m.png", 62, 44, true, TC_MEDIUM);
+    loadTargetCursor("target-cursor-blue-l.png", 82, 60, false, TC_LARGE);
+    loadTargetCursor("target-cursor-red-l.png", 82, 60, true, TC_LARGE);
 }
 
 void LocalPlayer::loadTargetCursor(const std::string &filename,
@@ -1071,9 +1066,8 @@ void LocalPlayer::loadTargetCursor(const std::string &filename,
     assert(size > -1);
     assert(size < 3);
 
-    ResourceManager *resman = ResourceManager::getInstance();
-
-    ImageSet *currentImageSet = resman->getImageSet(filename, width, height);
+    ImageSet *currentImageSet = SkinLoader::getImageSetFromTheme(filename,
+                                                                width, height);
     Animation *anim = new Animation;
 
     for (unsigned int i = 0; i < currentImageSet->size(); ++i)
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 8b5ecca3..24f346f7 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -21,6 +21,7 @@
 
 #include "resources/resourcemanager.h"
 
+#include "client.h"
 #include "log.h"
 
 #include "resources/dye.h"
@@ -211,7 +212,7 @@ std::string ResourceManager::getPath(const std::string &file)
     else
     {
         // if not found in search path return the default path
-        path = std::string(PKG_DATADIR) + std::string("data") + "/" + file;
+        path = Client::getPackageDirectory() + "/" + file;
     }
 
     return path;
diff --git a/src/text.cpp b/src/text.cpp
index 0b6b77ea..ce09146f 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -28,6 +28,7 @@
 
 #include "gui/gui.h"
 #include "gui/palette.h"
+#include "gui/skin.h"
 
 #include "resources/resourcemanager.h"
 #include "resources/image.h"
@@ -49,8 +50,7 @@ Text::Text(const std::string &text, int x, int y,
     if (textManager == 0)
     {
         textManager = new TextManager;
-        ResourceManager *resman = ResourceManager::getInstance();
-        Image *sbImage = resman->getImage("graphics/gui/bubble.png|W:#"
+        Image *sbImage = SkinLoader::getImageFromTheme("bubble.png|W:#"
             + config.getValue("speechBubblecolor", "000000"));
         mBubble.grid[0] = sbImage->getSubImage(0, 0, 5, 5);
         mBubble.grid[1] = sbImage->getSubImage(5, 0, 5, 5);
-- 
cgit v1.2.3-70-g09d2


From d3672f21211233c24b47ecd5d5965d3909fdf88f Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Sun, 28 Feb 2010 22:22:58 +0100
Subject: Some code cleanup regarding the server dialog

Reviewed-by: Jared Adams
---
 src/client.cpp           |  10 +--
 src/gui/serverdialog.cpp | 220 +++++++++++++++++++++++++----------------------
 src/net/serverinfo.h     |   9 +-
 3 files changed, 125 insertions(+), 114 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index a1b7a512..10a43b8e 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -344,10 +344,8 @@ Client::Client(const Options &options):
 
     SkinLoader::prepareThemePath();
 
-    // Initialize the item shortcuts.
+    // Initialize the item and emote shortcuts.
     itemShortcut = new ItemShortcut;
-
-    // Initialize the emote shortcuts.
     emoteShortcut = new EmoteShortcut;
 
     gui = new Gui(graphics);
@@ -608,7 +606,7 @@ int Client::exec()
                         SkinLoader::instance()->setMinimumOpacity(0.8f);
 
                         mCurrentDialog = new ServerDialog(&mCurrentServer,
-                                                         mConfigDir);
+                                                          mConfigDir);
                     }
                     else
                     {
@@ -1042,10 +1040,6 @@ void Client::initHomeDir()
 void Client::initConfiguration()
 {
     // Fill configuration with defaults
-    std::string defaultHost = branding.getValue("defaultServer",
-        "server.themanaworld.org");
-    int defaultPort = (int) branding.getValue("defaultPort", DEFAULT_PORT);
-    config.setValue("port", defaultPort);
     config.setValue("hwaccel", false);
 #if (defined __APPLE__ || defined WIN32) && defined USE_OPENGL
     config.setValue("opengl", true);
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index e4a765e7..25f92ad4 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -49,23 +49,17 @@
 
 #define MAX_SERVERLIST 5
 
-ServerInfo::Type stringToServerType(const std::string &type)
+static ServerInfo::Type stringToServerType(const std::string &type)
 {
     if (compareStrI(type, "eathena") == 0)
-    {
         return ServerInfo::EATHENA;
-    }
     else if (compareStrI(type, "manaserv") == 0)
-    {
         return ServerInfo::MANASERV;
-    }
-    else
-    {
-        return ServerInfo::UNKNOWN;
-    }
+
+    return ServerInfo::UNKNOWN;
 }
 
-std::string serverTypeToString(ServerInfo::Type type)
+static std::string serverTypeToString(ServerInfo::Type type)
 {
     switch (type)
     {
@@ -78,6 +72,18 @@ std::string serverTypeToString(ServerInfo::Type type)
     }
 }
 
+static unsigned short defaultPortForServerType(ServerInfo::Type type)
+{
+    switch (type)
+    {
+    default:
+    case ServerInfo::EATHENA:
+        return 6901;
+    case ServerInfo::MANASERV:
+        return 9601;
+    }
+}
+
 ServersListModel::ServersListModel(ServerInfos *servers, ServerDialog *parent):
         mServers(servers),
         mParent(parent)
@@ -138,28 +144,23 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
     mServerNameField = new TextField(mServerInfo->hostname);
     mPortField = new TextField(toString(mServerInfo->port));
 
-    ServerInfo currentServer;
-    // Add the most used servers from config if they are not in the online list
-    std::string currentConfig = "";
-    for (int i = 0; i <= MAX_SERVERLIST; i++)
+    // Add the most used servers from config
+    for (int i = 0; i <= MAX_SERVERLIST; ++i)
     {
-        currentServer.clear();
-
-        currentConfig = "MostUsedServerName" + toString(i);
-        currentServer.hostname = config.getValue(currentConfig, "");
+        const std::string index = toString(i);
+        const std::string nameKey = "MostUsedServerName" + index;
+        const std::string typeKey = "MostUsedServerType" + index;
+        const std::string portKey = "MostUsedServerPort" + index;
 
-        currentConfig = "MostUsedServerPort" + toString(i);
-        currentServer.port = (short) config.getValue(currentConfig,
-                                                     DEFAULT_PORT);
+        ServerInfo server;
+        server.hostname = config.getValue(nameKey, "");
+        server.type = stringToServerType(config.getValue(typeKey, ""));
 
-        currentConfig = "MostUsedServerType" + toString(i);
-        currentServer.type = stringToServerType(config
-                                                .getValue(currentConfig, ""));
+        const int defaultPort = defaultPortForServerType(server.type);
+        server.port = (unsigned short) config.getValue(portKey, defaultPort);
 
-        if (!currentServer.hostname.empty() && currentServer.port != 0)
-        {
-            mServers.push_back(currentServer);
-        }
+        if (server.isValid())
+            mServers.push_back(server);
     }
 
     mServersListModel = new ServersListModel(&mServers, this);
@@ -175,7 +176,7 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
 
     mQuitButton = new Button(_("Quit"), "quit", this);
     mConnectButton = new Button(_("Connect"), "connect", this);
-    mManualEntryButton = new Button(_("Add Entry"), "addEntry", this);
+    mManualEntryButton = new Button(_("Custom Server"), "addEntry", this);
 
     mServerNameField->setActionEventId("connect");
     mPortField->setActionEventId("connect");
@@ -247,7 +248,8 @@ void ServerDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "connect")
     {
         // Check login
-        if (mServerNameField->getText().empty() || mPortField->getText().empty())
+        if (mServerNameField->getText().empty()
+            || mPortField->getText().empty())
         {
             OkDialog *dlg = new OkDialog(_("Error"),
                 _("Please type both the address and the port of a server."));
@@ -261,7 +263,6 @@ void ServerDialog::action(const gcn::ActionEvent &event)
 
             // First, look if the entry is a new one.
             ServerInfo currentServer;
-            ServerInfo tempServer;
             currentServer.hostname = mServerNameField->getText();
             currentServer.port = (short) atoi(mPortField->getText().c_str());
             switch (mTypeField->getSelected())
@@ -284,21 +285,23 @@ void ServerDialog::action(const gcn::ActionEvent &event)
                             serverTypeToString(currentServer.type));
 
             // now add the rest of the list...
-            std::string currentConfig = "";
             int configCount = 1;
-            for (int i = 0; i < mServersListModel->getNumberOfElements(); i++)
+            for (int i = 0; i < mServersListModel->getNumberOfElements(); ++i)
             {
-                tempServer = mServersListModel->getServer(i);
+                const ServerInfo server = mServersListModel->getServer(i);
 
                 // ensure, that our server will not be added twice
-                if (tempServer != currentServer)
+                if (server != currentServer)
                 {
-                    currentConfig = "MostUsedServerName" + toString(configCount);
-                    config.setValue(currentConfig, toString(tempServer.hostname));
-                    currentConfig = "MostUsedServerPort" + toString(configCount);
-                    config.setValue(currentConfig, toString(tempServer.port));
-                    currentConfig = "MostUsedServerType" + toString(configCount);
-                    config.setValue(currentConfig, serverTypeToString(tempServer.type));
+                    const std::string index = toString(configCount);
+                    const std::string nameKey = "MostUsedServerName" + index;
+                    const std::string typeKey = "MostUsedServerType" + index;
+                    const std::string portKey = "MostUsedServerPort" + index;
+
+                    config.setValue(nameKey, toString(server.hostname));
+                    config.setValue(typeKey, serverTypeToString(server.type));
+                    config.setValue(portKey, toString(server.port));
+
                     configCount++;
                 }
 
@@ -337,7 +340,7 @@ void ServerDialog::keyPressed(gcn::KeyEvent &keyEvent)
     }
 }
 
-void ServerDialog::valueChanged(const gcn::SelectionEvent &event)
+void ServerDialog::valueChanged(const gcn::SelectionEvent &)
 {
     const int index = mServersList->getSelected();
     if (index == -1)
@@ -393,29 +396,23 @@ void ServerDialog::logic()
 
 void ServerDialog::setFieldsReadOnly(bool readOnly)
 {
-    if (readOnly)
-    {
-        mServerNameField->setEnabled(false);
-        mPortField->setEnabled(false);
-        mManualEntryButton->setVisible(true);
-        mDescription->setVisible(true);
-    }
-    else
+    if (!readOnly)
     {
-        mManualEntryButton->setVisible(false);
-
-        mDescription->setVisible(false);
         mDescription->setCaption(std::string());
         mServersList->setSelected(-1);
 
         mServerNameField->setText(std::string());
-        mServerNameField->setEnabled(true);
-
-        mPortField->setText(toString(DEFAULT_PORT));
-        mPortField->setEnabled(true);
+        mPortField->setText(std::string());
 
         mServerNameField->requestFocus();
     }
+
+    mManualEntryButton->setEnabled(readOnly);
+    mDescription->setVisible(readOnly);
+
+    mServerNameField->setEnabled(!readOnly);
+    mPortField->setEnabled(!readOnly);
+    mTypeField->setEnabled(!readOnly);
 }
 
 void ServerDialog::downloadServerList()
@@ -437,65 +434,74 @@ void ServerDialog::downloadServerList()
 
 void ServerDialog::loadServers()
 {
-    ServerInfo currentServer;
+    XML::Document doc(mDir + "/serverlist.xml", false);
+    xmlNodePtr rootNode = doc.rootNode();
 
-    xmlDocPtr doc = xmlReadFile((mDir + "/serverlist.xml").c_str(), NULL, 0);
+    if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "serverlist"))
+    {
+        logger->log("Error loading server list!");
+        return;
+    }
+
+    int version = XML::getProperty(rootNode, "version", 0);
+    if (version != 1)
+    {
+        logger->log("Error: unsupported online server list version: %d",
+                    version);
+        return;
+    }
 
-    if (doc != NULL)
+    for_each_xml_child_node(serverNode, rootNode)
     {
-        xmlNodePtr rootNode = xmlDocGetRootElement(doc);
-        int version = XML::getProperty(rootNode, "version", 3);
+        if (!xmlStrEqual(serverNode->name, BAD_CAST "server"))
+            continue;
+
+        ServerInfo server;
+
+        std::string type = XML::getProperty(serverNode, "type", "unknown");
+
+        server.type = stringToServerType(type);
+        server.name = XML::getProperty(serverNode, "name", std::string());
 
-        if (version != 1)
+        if (server.type == ServerInfo::UNKNOWN)
         {
-            logger->log("Online server list has wrong version");
-            return;
+            logger->log("Unknown server type: %s", type.c_str());
+            continue;
         }
 
-        for_each_xml_child_node(server, rootNode)
+        for_each_xml_child_node(subNode, serverNode)
         {
-            if (xmlStrEqual(server->name, BAD_CAST "server"))
-            {
-                std::string type = XML::getProperty(server, "type", "unknown");
-
-                currentServer.clear();
-                currentServer.name = XML::getProperty(server, "name", std::string());
-
-                for_each_xml_child_node(subnode, server)
-                {
-                    if (xmlStrEqual(subnode->name, BAD_CAST "connection"))
-                    {
-                        currentServer.type = stringToServerType(type);
-                        currentServer.hostname = XML::getProperty(subnode, "hostname", std::string());
-                        currentServer.port = XML::getProperty(subnode, "port", DEFAULT_PORT);
-                    }
-                }
+            if (!xmlStrEqual(subNode->name, BAD_CAST "connection"))
+                continue;
 
+            server.hostname = XML::getProperty(subNode, "hostname", "");
+            server.port = XML::getProperty(subNode, "port", 0);
+            if (server.port == 0)
+            {
+                // If no port is given, use the default for the given type
+                server.port = defaultPortForServerType(server.type);
+            }
+        }
 
-                MutexLocker lock(&mMutex);
-                // add the server to the local list (if it's not already present)
-                ServerInfos::iterator it;
-                bool found = false;
-                for (it = mServers.begin(); it != mServers.end(); it++)
-                {
-                    if ((*it) == currentServer)
-                    {
-                        (*it).name = currentServer.name;
-                        found = true;
-                        break;
-                    }
-                }
 
-                if (!found)
-                    mServers.push_back(currentServer);
+        MutexLocker lock(&mMutex);
+        // Add the server to the local list if it's not already present
+        ServerInfos::iterator it;
+        bool found = false;
+        for (it = mServers.begin(); it != mServers.end(); it++)
+        {
+            if ((*it) == server)
+            {
+                // Use the name listed in the server list
+                (*it).name = server.name;
+                found = true;
+                break;
             }
         }
 
-        xmlFreeDoc(doc);
+        if (!found)
+            mServers.push_back(server);
     }
-
-    MutexLocker lock(&mMutex);
-    mDownloadStatus = DOWNLOADING_COMPLETE;
 }
 
 int ServerDialog::downloadUpdate(void *ptr, DownloadStatus status,
@@ -522,9 +528,12 @@ int ServerDialog::downloadUpdate(void *ptr, DownloadStatus status,
     {
         float progress = (float) remaining / total;
 
-        if (progress != progress) progress = 0.0f; // check for NaN
-        if (progress < 0.0f) progress = 0.0f; // no idea how this could ever happen, but why not check for it anyway.
-        if (progress > 1.0f) progress = 1.0f;
+        if (progress != progress)
+            progress = 0.0f; // check for NaN
+        else if (progress < 0.0f)
+            progress = 0.0f; // no idea how this could ever happen, but why not check for it anyway.
+        else if (progress > 1.0f)
+            progress = 1.0f;
 
         MutexLocker lock(&sd->mMutex);
         sd->mDownloadStatus = DOWNLOADING_IN_PROGRESS;
@@ -534,6 +543,9 @@ int ServerDialog::downloadUpdate(void *ptr, DownloadStatus status,
     if (finished)
     {
         sd->loadServers();
+
+        MutexLocker lock(&sd->mMutex);
+        sd->mDownloadStatus = DOWNLOADING_COMPLETE;
     }
 
     return 0;
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index ae06984b..a1e22ce7 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -55,6 +55,11 @@ public:
         port = info.port;
     }
 
+    bool isValid() const
+    {
+        return !(hostname.empty() || port == 0 || type == UNKNOWN);
+    }
+
     void clear()
     {
         type = UNKNOWN;
@@ -63,13 +68,13 @@ public:
         port = 0;
     }
 
-    bool operator==(const ServerInfo &other)
+    bool operator==(const ServerInfo &other) const
     {
         return (type == other.type && hostname == other.hostname &&
                 port == other.port);
     }
 
-    bool operator!=(const ServerInfo &other)
+    bool operator!=(const ServerInfo &other) const
     {
         return (type != other.type || hostname != other.hostname ||
                 port != other.port);
-- 
cgit v1.2.3-70-g09d2


From 802bb1289f25be47d1897fe05871b561f82f9498 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sun, 28 Feb 2010 15:24:21 -0700
Subject: Fix loading branding data

Reviewed-by: Chuck Miller
---
 src/client.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index 10a43b8e..a21d004d 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -283,9 +283,7 @@ Client::Client(const Options &options):
         int loc = path.find_last_of('/');
 #endif
         if (loc > 0)
-            path = path.substr(0, loc + 1);
-
-        resman->addToSearchPath(path + "data", false);
+            resman->addToSearchPath(path.substr(0, loc + 1) + "data", false);
     }
 
     // Add the main data directories to our PhysicsFS search path
-- 
cgit v1.2.3-70-g09d2


From d357426f64cb6f484214ec166615d70e789d63c4 Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bwachter-tmw@lart.info>
Date: Mon, 1 Mar 2010 01:06:17 +0100
Subject: Check and create screenshot directory only when a screenshot is made

---
 src/client.cpp | 12 ------------
 src/game.cpp   | 12 +++++++++++-
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index a21d004d..dfa42034 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1181,10 +1181,6 @@ void Client::initScreenshotDir()
                 mScreenshotDir = getSpecialFolderLocation(CSIDL_DESKTOP);
 #else
             mScreenshotDir = std::string(PHYSFS_getUserDir()) + "Desktop";
-            // If ~/Desktop does not exist, we save screenshots in the user's home.
-            struct stat statbuf;
-            if (stat(mScreenshotDir.c_str(), &statbuf))
-                mScreenshotDir = std::string(PHYSFS_getUserDir());
 #endif
         }
         config.setValue("screenshotDirectory", mScreenshotDir);
@@ -1203,14 +1199,6 @@ void Client::initScreenshotDir()
             }
         }
     }
-
-    if (mkdir_r(mScreenshotDir.c_str()))
-    {
-        logger->log("Directory %s doesn't exist and can't be created! "
-                    "Setting screenshot directory to home.",
-                    mScreenshotDir.c_str());
-        mScreenshotDir = std::string(PHYSFS_getUserDir());
-    }
 }
 
 void Client::accountLogin(LoginData *loginData)
diff --git a/src/game.cpp b/src/game.cpp
index 00c143d4..e753e1f7 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -82,6 +82,7 @@
 #include "resources/resourcemanager.h"
 
 #include "utils/gettext.h"
+#include "utils/mkdir.h"
 
 #include <guichan/exception.hpp>
 #include <guichan/focushandler.hpp>
@@ -297,13 +298,22 @@ static bool saveScreenshot()
     std::stringstream filenameSuffix;
     std::stringstream filename;
     std::fstream testExists;
+    std::string screenshotDirectory = Client::getScreenshotDirectory();
     bool found = false;
 
+    if (mkdir_r(screenshotDirectory.c_str()) != 0)
+    {
+        logger->log("Directory %s doesn't exist and can't be created! "
+                    "Setting screenshot directory to home.",
+                    screenshotDirectory.c_str());
+        screenshotDirectory = std::string(PHYSFS_getUserDir());
+    }
+
     do {
         screenshotCount++;
         filenameSuffix.str("");
         filename.str("");
-        filename << Client::getScreenshotDirectory() << "/";
+        filename << screenshotDirectory << "/";
         filenameSuffix << branding.getValue("appShort", "Mana")
                        << "_Screenshot_" << screenshotCount << ".png";
         filename << filenameSuffix.str();
-- 
cgit v1.2.3-70-g09d2