summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-11-16 17:17:26 +0300
committerAndrei Karas <akaras@inbox.ru>2013-11-16 17:17:26 +0300
commit6b981b572854798901816ddccf7cb343690ca8f1 (patch)
tree0763c7296ffcaa1119768b59449e3b0303f8173a
parentde2d305a18ab00881de0a22f17d6307ddffe943e (diff)
downloadmanaverse-6b981b572854798901816ddccf7cb343690ca8f1.tar.gz
manaverse-6b981b572854798901816ddccf7cb343690ca8f1.tar.bz2
manaverse-6b981b572854798901816ddccf7cb343690ca8f1.tar.xz
manaverse-6b981b572854798901816ddccf7cb343690ca8f1.zip
Remove unused particle-effect attributes from items.xml.
-rw-r--r--src/resources/db/itemdb.cpp4
-rw-r--r--src/resources/iteminfo.cpp1
-rw-r--r--src/resources/iteminfo.h7
3 files changed, 0 insertions, 12 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 51fcb69d9..03b23f01d 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -413,10 +413,6 @@ void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum)
{
if (xmlNameEqual(itemChild, "sprite"))
{
- std::string attackParticle = XML::getProperty(
- itemChild, "particle-effect", "");
- itemInfo->setParticleEffect(attackParticle);
-
loadSpriteRef(itemInfo, itemChild);
}
else if (xmlNameEqual(itemChild, "particlefx"))
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index cc7cc41c7..5845138d2 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -41,7 +41,6 @@ ItemInfo::ItemInfo() :
mDescription(),
mEffect(),
mType(ITEM_UNUSABLE),
- mParticle(),
mWeight(0),
mView(0),
mId(0),
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 43f645e58..76a9b78c7 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -118,12 +118,6 @@ class ItemInfo final
const std::string getName(const unsigned char color)
const A_WARN_UNUSED;
- void setParticleEffect(const std::string &particleEffect)
- { mParticle = particleEffect; }
-
- std::string getParticleEffect() const A_WARN_UNUSED
- { return mParticle; }
-
void setDisplay(const SpriteDisplay &display)
{ mDisplay = display; }
@@ -318,7 +312,6 @@ class ItemInfo final
std::string mDescription; /**< Short description. */
std::string mEffect; /**< Description of effects. */
ItemType mType; /**< Item type. */
- std::string mParticle; /**< Particle effect used with this item */
int mWeight; /**< Weight in grams. */
int mView; /**< Item ID of how this item looks. */
int mId; /**< Item ID */