summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-07-25 16:28:30 +0300
committerAndrei Karas <akaras@inbox.ru>2015-07-25 16:28:30 +0300
commit1608d342c064f79b239e4671da516d270445b385 (patch)
treef56b9ebd8d09da0b914afa58421b4d6b81fcecda
parentfffbd86a1014ad169ed2d68ea58cdddf346faa14 (diff)
downloadmv-1608d342c064f79b239e4671da516d270445b385.tar.gz
mv-1608d342c064f79b239e4671da516d270445b385.tar.bz2
mv-1608d342c064f79b239e4671da516d270445b385.tar.xz
mv-1608d342c064f79b239e4671da516d270445b385.zip
Move some init code from Client::gameExec into Client::gameInit.
-rw-r--r--src/client.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/client.cpp b/src/client.cpp
index adf2ffdb2..5bd3bd163 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -455,6 +455,18 @@ void Client::gameInit()
WindowManager::updateScreenKeyboard(SDL_GetScreenKeyboardHeight(nullptr));
#endif
#endif
+
+#ifdef USE_MUMBLE
+ if (!mumbleManager)
+ mumbleManager = new MumbleManager();
+#endif
+
+ mSkin = theme->load("windowmenu.xml", "");
+ if (mSkin)
+ {
+ mButtonPadding = mSkin->getPadding();
+ mButtonSpacing = mSkin->getOption("spacing", 3);
+ }
}
Client::~Client()
@@ -689,18 +701,6 @@ int Client::gameExec()
{
int lastTickTime = tick_time;
-#ifdef USE_MUMBLE
- if (!mumbleManager)
- mumbleManager = new MumbleManager();
-#endif
-
- mSkin = theme->load("windowmenu.xml", "");
- if (mSkin)
- {
- mButtonPadding = mSkin->getPadding();
- mButtonSpacing = mSkin->getOption("spacing", 3);
- }
-
while (mState != STATE_EXIT)
{
PROFILER_START();