summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-26 00:23:36 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-26 19:27:36 +0300
commit4c6ceccbd41bfa0cd85900c1cbfa4b495b57b23f (patch)
tree7933f16579b9cd8754581207d2a50c5926e6f635 /src
parentd004880b9054d61fa0f092ba74553d8062e36b4b (diff)
downloadmv-4c6ceccbd41bfa0cd85900c1cbfa4b495b57b23f.tar.gz
mv-4c6ceccbd41bfa0cd85900c1cbfa4b495b57b23f.tar.bz2
mv-4c6ceccbd41bfa0cd85900c1cbfa4b495b57b23f.tar.xz
mv-4c6ceccbd41bfa0cd85900c1cbfa4b495b57b23f.zip
Add constexpr into item.
Diffstat (limited to 'src')
-rw-r--r--src/resources/item/item.cpp8
-rw-r--r--src/resources/item/item.h8
2 files changed, 7 insertions, 9 deletions
diff --git a/src/resources/item/item.cpp b/src/resources/item/item.cpp
index 4627225f2..9d3a1b3f8 100644
--- a/src/resources/item/item.cpp
+++ b/src/resources/item/item.cpp
@@ -181,11 +181,3 @@ void Item::updateColor()
if (serverFeatures && serverFeatures->haveItemColors())
setId(mId, ItemColorManager::getColorFromCards(&mCards[0]));
}
-
-bool Item::isItem(const int id)
-{
- return id != 0 &&
- id != CARD0_FORGE &&
- id != CARD0_CREATE &&
- id != CARD0_PET;
-}
diff --git a/src/resources/item/item.h b/src/resources/item/item.h
index 64e5fa063..0a3eeea9e 100644
--- a/src/resources/item/item.h
+++ b/src/resources/item/item.h
@@ -227,7 +227,13 @@ class Item notfinal
void updateColor();
- static bool isItem(const int id);
+ static constexpr bool isItem(const int id)
+ {
+ return id != 0 &&
+ id != CARD0_FORGE &&
+ id != CARD0_CREATE &&
+ id != CARD0_PET;
+ }
int mId; /**< Item id. */
ItemColor mColor;