summaryrefslogtreecommitdiff
path: root/src/resources/itemdb.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/itemdb.cpp')
-rw-r--r--src/resources/itemdb.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 5e1b2a2f..1457b6dd 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -199,7 +199,13 @@ void ItemDB::loadCommonRef(ItemInfo *itemInfo, xmlNodePtr node)
std::string attackAction = XML::getProperty(node, "attack-action",
SpriteAction::INVALID);
int attackRange = XML::getProperty(node, "attack-range", 0);
- std::string missileParticle = XML::getProperty(node, "missile-particle", "");
+ std::string missileParticleFile = XML::getProperty(node,
+ "missile-particle",
+ "");
+ int hitEffectId = XML::getProperty(node, "hit-effect-id",
+ paths.getIntValue("hitEffectId"));
+ int criticalEffectId = XML::getProperty(node, "critical-hit-effect-id",
+ paths.getIntValue("criticalHitEffectId"));
// Load Ta Item Type
std::string typeStr = XML::getProperty(node, "type", "other");
@@ -218,7 +224,9 @@ void ItemDB::loadCommonRef(ItemInfo *itemInfo, xmlNodePtr node)
itemInfo->mWeight = weight;
itemInfo->mAttackAction = attackAction;
itemInfo->mAttackRange = attackRange;
- itemInfo->setMissileParticle(missileParticle);
+ itemInfo->setMissileParticleFile(missileParticleFile);
+ itemInfo->setHitEffectId(hitEffectId);
+ itemInfo->setCriticalHitEffectId(criticalEffectId);
// Load <sprite>, <sound>, and <floor>
for_each_xml_child_node(itemChild, node)