summaryrefslogtreecommitdiff
path: root/src/gui/gui.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-30 12:46:49 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-30 12:46:49 +0300
commit9bb11133522836a9c5e251550ac88c9a4e091c0e (patch)
treef65703ac1a51b79a0766c48420769d28d0847f41 /src/gui/gui.cpp
parente55ed9a138e97f6fba5e3b6858a755f8a50197d2 (diff)
downloadManaVerse-9bb11133522836a9c5e251550ac88c9a4e091c0e.tar.gz
ManaVerse-9bb11133522836a9c5e251550ac88c9a4e091c0e.tar.bz2
ManaVerse-9bb11133522836a9c5e251550ac88c9a4e091c0e.tar.xz
ManaVerse-9bb11133522836a9c5e251550ac88c9a4e091c0e.zip
Move main window related code into windowmanager.
Diffstat (limited to 'src/gui/gui.cpp')
-rw-r--r--src/gui/gui.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index c7d7fd8a1..52abd30b6 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -70,6 +70,7 @@
#include "gui/sdlinput.h"
#include "gui/theme.h"
#include "gui/viewport.h"
+#include "gui/windowmanager.h"
#include "gui/fonts/font.h"
@@ -78,6 +79,7 @@
#include "client.h"
#include "configuration.h"
#include "dragdrop.h"
+#include "settings.h"
#include "touchmanager.h"
#include "events/keyevent.h"
@@ -463,7 +465,7 @@ void Gui::draw()
int mouseY;
const MouseStateType button = getMouseState(&mouseX, &mouseY);
- if ((client->getMouseFocused() || button & SDL_BUTTON(1))
+ if ((settings.mouseFocused || button & SDL_BUTTON(1))
&& mMouseCursors && mCustomCursor && mMouseCursorAlpha > 0.0F)
{
const Image *const image = dragDrop.getItemImage();