From 6d44c69cb0cc9c2ac8a94c56c07ed45f63ab9726 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 15 Oct 2015 22:08:56 +0300 Subject: Rename blockTile to AddBlockMask in map. --- src/resources/map/map.cpp | 4 ++-- src/resources/map/map.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/resources/map') diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index bcc84417c..097a7a11d 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -679,7 +679,7 @@ const Tileset *Map::getTilesetWithGid(const int gid) const return nullptr; } -void Map::blockTile(const int x, const int y, +void Map::addBlockMask(const int x, const int y, const BlockTypeT type) { if (type == BlockType::NONE || !contains(x, y)) @@ -735,7 +735,7 @@ unsigned char Map::getBlockMask(const int x, const int y) const void Map::setWalk(const int x, const int y) { - blockTile(x, y, BlockType::GROUNDTOP); + addBlockMask(x, y, BlockType::GROUNDTOP); } bool Map::contains(const int x, const int y) const diff --git a/src/resources/map/map.h b/src/resources/map/map.h index c1b84ae83..9c74875d8 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -145,8 +145,8 @@ class Map final : public Properties, public ConfigListener /** * Marks a tile as occupied. */ - void blockTile(const int x, const int y, - const BlockTypeT type); + void addBlockMask(const int x, const int y, + const BlockTypeT type); /** * Gets walkability for a tile with a blocking bitmask. When called -- cgit v1.2.3-60-g2f50