summaryrefslogtreecommitdiff
path: root/src/gui/viewport.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-02-21 02:12:14 +0300
committerAndrei Karas <akaras@inbox.ru>2016-02-21 02:53:45 +0300
commitff10b54405fe8980a022e98cd79d912c1f0ac353 (patch)
tree679a8096d1e30858760196c2a2ef95ddd6bcd58c /src/gui/viewport.cpp
parent6c01b391c288622d8e360d823c9c1e35a874fa58 (diff)
downloadmv-ff10b54405fe8980a022e98cd79d912c1f0ac353.tar.gz
mv-ff10b54405fe8980a022e98cd79d912c1f0ac353.tar.bz2
mv-ff10b54405fe8980a022e98cd79d912c1f0ac353.tar.xz
mv-ff10b54405fe8980a022e98cd79d912c1f0ac353.zip
Add missing checks.
Diffstat (limited to 'src/gui/viewport.cpp')
-rw-r--r--src/gui/viewport.cpp19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 1a8231780..e0d5d217f 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -491,13 +491,16 @@ bool Viewport::leftMouseAction()
}
else if (stopAttack)
{
- const int mouseTileX = (mMouseX + mPixelViewX)
- / mMap->getTileWidth();
- const int mouseTileY = (mMouseY + mPixelViewY)
- / mMap->getTileHeight();
- inputManager.executeChatCommand(InputAction::PET_MOVE,
- strprintf("%d %d", mouseTileX, mouseTileY),
- nullptr);
+ if (mMap)
+ {
+ const int mouseTileX = (mMouseX + mPixelViewX)
+ / mMap->getTileWidth();
+ const int mouseTileY = (mMouseY + mPixelViewY)
+ / mMap->getTileHeight();
+ inputManager.executeChatCommand(InputAction::PET_MOVE,
+ strprintf("%d %d", mouseTileX, mouseTileY),
+ nullptr);
+ }
return true;
}
// Just walk around
@@ -587,6 +590,8 @@ void Viewport::getMouseTile(int &destX, int &destY)
void Viewport::getMouseTile(const int x, const int y,
int &destX, int &destY) const
{
+ if (!mMap)
+ return;
const int tw = mMap->getTileWidth();
const int th = mMap->getTileHeight();
destX = CAST_S32(x + mPixelViewX)