diff options
| -rw-r--r-- | src/being/being.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/skilldialog.cpp | 8 | ||||
| -rw-r--r-- | src/resources/skill/skilldata.cpp | 4 | ||||
| -rw-r--r-- | src/resources/skill/skilldata.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 030f022a2..28a6a1f8d 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -1023,7 +1023,7 @@ void Being::handleSkillCasting(Being *restrict const victim, effectManager->triggerDefault(data->castingDstEffectId, victim, paths.getIntValue("skillCastingDstEffectId")); - fireMissile(victim, data->castingParticle); + fireMissile(victim, data->castingMissileParticle); } } @@ -1046,7 +1046,7 @@ void Being::handleSkill(Being *restrict const victim, effectManager->triggerDefault(data->dstEffectId, victim, paths.getIntValue("skillDstEffectId")); - fireMissile(victim, data->particle); + fireMissile(victim, data->missileParticle); } if (this != localPlayer && (skill != nullptr)) diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 615ac8319..a1ad9b6ab 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -562,10 +562,10 @@ void SkillDialog::loadSkillData(XmlNodeConstPtr node, "shortName", name.substr(0, 3)); data->description = XML::langProperty( node, "description", ""); - data->particle = XML::getProperty( - node, "particle", ""); - data->castingParticle = XML::getProperty( - node, "castingParticle", ""); + data->missileParticle = XML::getProperty( + node, "missile-particle", ""); + data->castingMissileParticle = XML::getProperty( + node, "castingMissile-particle", ""); data->castingAnimation = XML::getProperty( node, "castingAnimation", diff --git a/src/resources/skill/skilldata.cpp b/src/resources/skill/skilldata.cpp index fb97a6aef..701eed31f 100644 --- a/src/resources/skill/skilldata.cpp +++ b/src/resources/skill/skilldata.cpp @@ -37,8 +37,8 @@ SkillData::SkillData() : shortName(), dispName(), description(), - particle(), - castingParticle(), + missileParticle(), + castingMissileParticle(), invokeCmd(), castingAnimation(), soundHit(std::string(), 0), diff --git a/src/resources/skill/skilldata.h b/src/resources/skill/skilldata.h index c4cc1124a..44374e98a 100644 --- a/src/resources/skill/skilldata.h +++ b/src/resources/skill/skilldata.h @@ -34,8 +34,8 @@ struct SkillData final std::string dispName; std::string description; - std::string particle; - std::string castingParticle; + std::string missileParticle; + std::string castingMissileParticle; std::string invokeCmd; std::string castingAnimation; |