diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
| commit | 382067b05c4fe97bcf0da0143405375ec295f7c6 (patch) | |
| tree | f668cd2595ac0c85f0942f88729d3ff1956676fa /src/maplayer.h | |
| parent | ee8191705826d978b7793497fdd307536c709bff (diff) | |
| parent | 9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff) | |
| download | plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2 plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/maplayer.h')
| -rw-r--r-- | src/maplayer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/maplayer.h b/src/maplayer.h index 697f52c89..dcfdb991e 100644 --- a/src/maplayer.h +++ b/src/maplayer.h @@ -177,8 +177,9 @@ class MapLayer final: public ConfigListener void optionChanged(const std::string &value) override final; - int getTileDrawWidth(const Image *img, - const int endX, int &width) const A_WARN_UNUSED; + static int getTileDrawWidth(const Image *img, + const int endX, + int &width) A_WARN_UNUSED; private: int mX; |