summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-16 22:19:04 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-16 22:22:11 +0300
commitae51c95555884dc5aba64c76648eeeb9a2bbb0c3 (patch)
tree4296036e12f5ee9067b17c6e5a8114d006480b9f /src/resources
parentc77971cb8dc2fcb4613f58d863e184d23a762519 (diff)
downloadmv-ae51c95555884dc5aba64c76648eeeb9a2bbb0c3.tar.gz
mv-ae51c95555884dc5aba64c76648eeeb9a2bbb0c3.tar.bz2
mv-ae51c95555884dc5aba64c76648eeeb9a2bbb0c3.tar.xz
mv-ae51c95555884dc5aba64c76648eeeb9a2bbb0c3.zip
Add attribute cardColor to items in items.xml.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/itemdb.cpp3
-rw-r--r--src/resources/iteminfo.cpp1
-rw-r--r--src/resources/iteminfo.h7
3 files changed, 11 insertions, 0 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 9cd687768..2f593e551 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -299,6 +299,7 @@ void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum)
const std::string typeStr = XML::getProperty(node, "type", "other");
const int weight = XML::getProperty(node, "weight", 0);
const int view = XML::getProperty(node, "view", 0);
+ const int cardColor = XML::getProperty(node, "cardColor", -1);
std::string name = XML::langProperty(node, "name", "");
std::string image = XML::getProperty(node, "image", "");
@@ -366,6 +367,8 @@ void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum)
itemInfo->setPet(pet);
itemInfo->setProtected(XML::getBoolProperty(
node, "sellProtected", false));
+ if (cardColor != -1)
+ itemInfo->setCardColor(fromInt(cardColor, ItemColor));
switch (itemInfo->getType())
{
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 52e238a5d..ade20ef0b 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -61,6 +61,7 @@ ItemInfo::ItemInfo() :
mTags(),
mColorsList(nullptr),
mColorsListName(),
+ mCardColor(ItemColor_zero),
mHitEffectId(-1),
mCriticalHitEffectId(-1),
mMissEffectId(-1),
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 5d7b2f15f..27191f92e 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -228,6 +228,12 @@ class ItemInfo final
int getPet() const
{ return mPet; }
+ void setCardColor(const ItemColor color)
+ { mCardColor = color; }
+
+ ItemColor getCardColor() const
+ { return mCardColor; }
+
/** Effects to be shown when weapon attacks - see also effects.xml */
std::string mMissileParticleFile;
@@ -320,6 +326,7 @@ class ItemInfo final
std::map <int, int> mTags;
const std::map <ItemColor, ColorDB::ItemColorData> *mColorsList;
std::string mColorsListName;
+ ItemColor mCardColor;
int mHitEffectId;
int mCriticalHitEffectId;
int mMissEffectId;