diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/itemdb.cpp | 4 | ||||
| -rw-r--r-- | src/resources/iteminfo.h | 22 | ||||
| -rw-r--r-- | src/resources/monsterinfo.cpp | 1 |
3 files changed, 18 insertions, 9 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 0031bbd0..2eff514c 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -110,6 +110,10 @@ void ItemDB::load() { if (xmlStrEqual(itemChild->name, BAD_CAST "sprite")) { + std::string attackParticle = XML::getProperty( + itemChild, "particle-effect", ""); + itemInfo->setParticleEffect(attackParticle); + loadSpriteRef(itemInfo, itemChild); } else if (xmlStrEqual(itemChild->name, BAD_CAST "sound")) diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index d3dd4908..0ea59050 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -67,6 +67,11 @@ class ItemInfo const std::string& getName() const { return mName; } + void setParticleEffect(const std::string &particleEffect) + { mParticle = particleEffect; } + + std::string getParticleEffect() const { return mParticle; } + void setImageName(const std::string &imageName) { mImageName = imageName; } @@ -113,17 +118,18 @@ class ItemInfo const std::string& getSound(EquipmentSoundEvent event) const; protected: - std::string mImageName; /**< The filename of the icon image. */ + std::string mImageName; /**< The filename of the icon image. */ std::string mName; - std::string mDescription; /**< Short description. */ - std::string mEffect; /**< Description of effects. */ - std::string mType; /**< Item type. */ - short mWeight; /**< Weight in grams. */ - int mView; /**< Item ID of how this item looks. */ - int mId; /**< Item ID */ + std::string mDescription; /**< Short description. */ + std::string mEffect; /**< Description of effects. */ + std::string mType; /**< Item type. */ + std::string mParticle; /**< Particle effect used with this item */ + short mWeight; /**< Weight in grams. */ + int mView; /**< Item ID of how this item looks. */ + int mId; /**< Item ID */ // Equipment related members - SpriteAction mAttackType; /**< Attack type, in case of weapon. */ + SpriteAction mAttackType; /**< Attack type, in case of weapon. */ /** Maps gender to sprite filenames. */ std::map<int, std::string> mAnimationFiles; diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index 5491a0bd..725e9cf5 100644 --- a/src/resources/monsterinfo.cpp +++ b/src/resources/monsterinfo.cpp @@ -36,7 +36,6 @@ MonsterInfo::~MonsterInfo() mSounds.clear(); } - void MonsterInfo::addSound(MonsterSoundEvent event, std::string filename) { if (mSounds.find(event) == mSounds.end()) |