summaryrefslogtreecommitdiff
path: root/src/resources/monsterdb.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/monsterdb.cpp')
-rw-r--r--src/resources/monsterdb.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 6bc64a89..ca9b8e83 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -124,15 +124,14 @@ void MonsterDB::load()
else if (xmlStrEqual(spriteNode->name, BAD_CAST "attack"))
{
const int id = XML::getProperty(spriteNode, "id", 0);
- const std::string particleEffect = XML::getProperty(
- spriteNode, "particle-effect", "");
+ int effectId = XML::getProperty(spriteNode, "effect-id", -1);
const std::string spriteAction = XML::getProperty(spriteNode,
"action",
"attack");
- const std::string missileParticle = XML::getProperty(
- spriteNode, "missile-particle", "");
- currentInfo->addAttack(id, spriteAction,
- particleEffect, missileParticle);
+ const std::string missileParticleFilename =
+ XML::getProperty(spriteNode, "missile-particle", "");
+ currentInfo->addAttack(id, spriteAction, effectId,
+ missileParticleFilename);
}
else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx"))
{