diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-10-15 22:00:10 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-10-15 22:18:35 +0300 |
commit | 7e35fd53d5fdc658facfce281577421296f8e3c1 (patch) | |
tree | b1ebf61c376b0e1d92446a9fd6addc2c99cf415a /src | |
parent | 60580edaea11f6a39ef8786e6576110b81fa106c (diff) | |
download | mv-7e35fd53d5fdc658facfce281577421296f8e3c1.tar.gz mv-7e35fd53d5fdc658facfce281577421296f8e3c1.tar.bz2 mv-7e35fd53d5fdc658facfce281577421296f8e3c1.tar.xz mv-7e35fd53d5fdc658facfce281577421296f8e3c1.zip |
Simplify setWall function in map.
Diffstat (limited to 'src')
-rw-r--r-- | src/being/localplayer.cpp | 2 | ||||
-rw-r--r-- | src/resources/map/map.cpp | 2 | ||||
-rw-r--r-- | src/resources/map/map.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index cde59bd7a..33133a376 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -2492,7 +2492,7 @@ void LocalPlayer::setRealPos(const int x, const int y) mCrossY = y; } if (mMap->isCustom()) - mMap->setWalk(x, y, true); + mMap->setWalk(x, y); } void LocalPlayer::fixAttackTarget() { diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index 8ad0c5977..bcc84417c 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -733,7 +733,7 @@ unsigned char Map::getBlockMask(const int x, const int y) const return mMetaTiles[x + y * mWidth].blockmask; } -void Map::setWalk(const int x, const int y, const bool walkable A_UNUSED) +void Map::setWalk(const int x, const int y) { blockTile(x, y, BlockType::GROUNDTOP); } diff --git a/src/resources/map/map.h b/src/resources/map/map.h index 80f74e0ae..c1b84ae83 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -156,7 +156,7 @@ class Map final : public Properties, public ConfigListener const unsigned char blockWalkMask = BlockMask::WALL | BlockMask::AIR | BlockMask::WATER) const A_WARN_UNUSED; - void setWalk(const int x, const int y, const bool walkable); + void setWalk(const int x, const int y); unsigned char getBlockMask(const int x, const int y) const; |