diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
| commit | a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63 (patch) | |
| tree | 2d85d112997176e9ab765e638b0e7f2e16677b83 /src/item.h | |
| parent | 5c83a96b8ad85ad0562542b9720a0df6c5fb550c (diff) | |
| parent | 8983700f6c8cc6496626ed3af235e1ec31fe5501 (diff) | |
| download | mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.gz mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.bz2 mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.xz mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/item.h')
| -rw-r--r-- | src/item.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/item.h b/src/item.h index adb6ec03e..dc4600d8b 100644 --- a/src/item.h +++ b/src/item.h @@ -153,12 +153,12 @@ class Item const ItemInfo &getInfo() const A_WARN_UNUSED { return ItemDB::get(mId); } - std::string getName() A_WARN_UNUSED; + std::string getName() const A_WARN_UNUSED; static Image *getImage(const int id, const unsigned char color) A_WARN_UNUSED; - bool isHaveTag(const int tagId) A_WARN_UNUSED; + bool isHaveTag(const int tagId) const A_WARN_UNUSED; unsigned char getColor() const A_WARN_UNUSED { return mColor; } |