From 4c6ceccbd41bfa0cd85900c1cbfa4b495b57b23f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 26 Aug 2016 00:23:36 +0300 Subject: Add constexpr into item. --- src/resources/item/item.cpp | 8 -------- src/resources/item/item.h | 8 +++++++- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src') 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; -- cgit v1.2.3-60-g2f50