diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-02 13:03:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-02 13:03:05 +0300 |
| commit | ee8191705826d978b7793497fdd307536c709bff (patch) | |
| tree | 6cfbfc9d72bf636d2da373b4d023705207db4685 /src/gui/viewport.cpp | |
| parent | fb5d0e7762f692948dddebd3deb38a0bd20de5f2 (diff) | |
| parent | 0c4ed5a9594b849b436fca13c6992dee923915ed (diff) | |
| download | plus-ee8191705826d978b7793497fdd307536c709bff.tar.gz plus-ee8191705826d978b7793497fdd307536c709bff.tar.bz2 plus-ee8191705826d978b7793497fdd307536c709bff.tar.xz plus-ee8191705826d978b7793497fdd307536c709bff.zip | |
Merge branch 'temp1' into stable
Diffstat (limited to 'src/gui/viewport.cpp')
| -rw-r--r-- | src/gui/viewport.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 933c00040..5206b7424 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -275,7 +275,9 @@ void Viewport::logic() void Viewport::_followMouse() { - const uint8_t button = SDL_GetMouseState(&mMouseX, &mMouseY); + if (!gui) + return; + const uint8_t button = gui->getMouseState(&mMouseX, &mMouseY); // If the left button is dragged if (mPlayerFollowMouse && (button & SDL_BUTTON(1))) { @@ -297,10 +299,10 @@ void Viewport::_followMouse() void Viewport::_drawDebugPath(Graphics *const graphics) { - if (!player_node || !userPalette || !actorManager || !mMap) + if (!player_node || !userPalette || !actorManager || !mMap || !gui) return; - SDL_GetMouseState(&mMouseX, &mMouseY); + gui->getMouseState(&mMouseX, &mMouseY); static Path debugPath; static Vector lastMouseDestination = Vector(0.0F, 0.0F); |