summaryrefslogtreecommitdiff
path: root/src/client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/client.cpp')
-rw-r--r--src/client.cpp10
1 files changed, 2 insertions, 8 deletions
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);