summaryrefslogtreecommitdiff
path: root/src/map.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-15 17:01:46 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-15 17:01:46 +0300
commit382067b05c4fe97bcf0da0143405375ec295f7c6 (patch)
treef668cd2595ac0c85f0942f88729d3ff1956676fa /src/map.h
parentee8191705826d978b7793497fdd307536c709bff (diff)
parent9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff)
downloadplus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz
plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2
plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz
plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip
Merge branch 'master' into stable
Diffstat (limited to 'src/map.h')
-rw-r--r--src/map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map.h b/src/map.h
index 9c9d0100f..26303da7a 100644
--- a/src/map.h
+++ b/src/map.h
@@ -240,7 +240,7 @@ class Map final : public Properties, public ConfigListener
void setWalk(const int x, const int y, const bool walkable);
- unsigned char getBlockMask(const int x, const int y);
+ unsigned char getBlockMask(const int x, const int y) const;
/**
* Returns the width of this map in tiles.