summaryrefslogtreecommitdiff
path: root/src/gui/viewport.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-04-26 20:30:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-04-26 20:30:22 +0300
commit6b06a89665fdfa9ecc7179bae827cefae3cb1a77 (patch)
treed90008a75b6d3d883591ccce196b43c94c3cd67c /src/gui/viewport.cpp
parentbcdf34645ff3067d3b4110120b6191af2b0b2e99 (diff)
parent2ee2f8b060e4fe88feeeba5508189c916e55a70d (diff)
downloadplus-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.tar.gz
plus-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.tar.bz2
plus-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.tar.xz
plus-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.zip
Merge branch 'master' into stablestable
Diffstat (limited to 'src/gui/viewport.cpp')
-rw-r--r--src/gui/viewport.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 46d47ab4a..c7e2b31df 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -270,13 +270,12 @@ void Viewport::logic()
BLOCK_START("Viewport::logic")
// Make the player follow the mouse position
// if the mouse is dragged elsewhere than in a window.
- followMouse();
+ Gui::getMouseState(&mMouseX, &mMouseY);
BLOCK_END("Viewport::logic")
}
void Viewport::followMouse()
{
- return;
if (!gui)
return;
const uint8_t button = Gui::getMouseState(&mMouseX, &mMouseY);