From 451e5fbbf6a3ee7077caf31a45a37945c3a9ecf7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 8 Aug 2016 21:07:03 +0300
Subject: Remove default value from block mask in Map::getWalk.

---
 src/gui/viewport.cpp | 74 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 66 insertions(+), 8 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index e476e4b38..672708394 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -623,8 +623,15 @@ void Viewport::getMouseTile(const int x, const int y,
         const int tileViewY = mPixelViewY / th;
         for (int f = tileViewY; f < tileViewY + heightTiles; f ++)
         {
-            if (!mMap->getWalk(destX, f))
+            if (!mMap->getWalk(destX,
+                f,
+                BlockMask::WALL |
+                BlockMask::AIR |
+                BlockMask::WATER |
+                BlockMask::PLAYERWALL))
+            {
                 continue;
+            }
 
             const int offset = mMap->getHeightOffset(
                 destX, f) * th2;
@@ -697,7 +704,12 @@ void Viewport::walkByMouse(const MouseEvent &event)
                 else if (y < 0)
                     dy = -1;
 
-                if (mMap->getWalk(playerX + dx, playerY + dy))
+                if (mMap->getWalk(playerX + dx,
+                    playerY + dy,
+                    BlockMask::WALL |
+                    BlockMask::AIR |
+                    BlockMask::WATER |
+                    BlockMask::PLAYERWALL))
                 {
                     localPlayer->navigateTo(playerX + dx, playerY + dy);
                 }
@@ -708,17 +720,35 @@ void Viewport::walkByMouse(const MouseEvent &event)
                         // try avoid diagonal collision
                         if (x2 > y2)
                         {
-                            if (mMap->getWalk(playerX + dx, playerY))
+                            if (mMap->getWalk(playerX + dx,
+                                playerY,
+                                BlockMask::WALL |
+                                BlockMask::AIR |
+                                BlockMask::WATER |
+                                BlockMask::PLAYERWALL))
+                            {
                                 dy = 0;
+                            }
                             else
+                            {
                                 dx = 0;
+                            }
                         }
                         else
                         {
-                            if (mMap->getWalk(playerX, playerY + dy))
+                            if (mMap->getWalk(playerX,
+                                playerY + dy,
+                                BlockMask::WALL |
+                                BlockMask::AIR |
+                                BlockMask::WATER |
+                                BlockMask::PLAYERWALL))
+                            {
                                 dx = 0;
+                            }
                             else
+                            {
                                 dy = 0;
+                            }
                         }
                     }
                     else
@@ -726,17 +756,45 @@ void Viewport::walkByMouse(const MouseEvent &event)
                         // try avoid vertical or horisontal collision
                         if (!dx)
                         {
-                            if (mMap->getWalk(playerX + 1, playerY + dy))
+                            if (mMap->getWalk(playerX + 1,
+                                playerY + dy,
+                                BlockMask::WALL |
+                                BlockMask::AIR |
+                                BlockMask::WATER |
+                                BlockMask::PLAYERWALL))
+                            {
                                 dx = 1;
-                            if (mMap->getWalk(playerX - 1, playerY + dy))
+                            }
+                            if (mMap->getWalk(playerX - 1,
+                                playerY + dy,
+                                BlockMask::WALL |
+                                BlockMask::AIR |
+                                BlockMask::WATER |
+                                BlockMask::PLAYERWALL))
+                            {
                                 dx = -1;
+                            }
                         }
                         if (!dy)
                         {
-                            if (mMap->getWalk(playerX + dx, playerY + 1))
+                            if (mMap->getWalk(playerX + dx,
+                                playerY + 1,
+                                BlockMask::WALL |
+                                BlockMask::AIR |
+                                BlockMask::WATER |
+                                BlockMask::PLAYERWALL))
+                            {
                                 dy = 1;
-                            if (mMap->getWalk(playerX + dx, playerY - 1))
+                            }
+                            if (mMap->getWalk(playerX + dx,
+                                playerY - 1,
+                                BlockMask::WALL |
+                                BlockMask::AIR |
+                                BlockMask::WATER |
+                                BlockMask::PLAYERWALL))
+                            {
                                 dy = -1;
+                            }
                         }
                     }
                     localPlayer->navigateTo(playerX + dx, playerY + dy);
-- 
cgit v1.2.3-70-g09d2