summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/beinginfo.cpp4
-rw-r--r--src/resources/npcdb.cpp2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 905d28921..9e2f9a395 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -122,9 +122,7 @@ void BeingInfo::addAttack(const int id, std::string action, const int effectId,
const int missEffectId,
const std::string &missileParticle)
{
- if (mAttacks[id])
- delete mAttacks[id];
-
+ delete mAttacks[id];
mAttacks[id] = new Attack(action, effectId, hitEffectId,
criticalHitEffectId, missEffectId, missileParticle);
}
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 6e94bb3c3..9fc8ea73c 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -71,7 +71,7 @@ void NPCDB::load()
BeingInfo *const currentInfo = new BeingInfo;
- currentInfo->setTargetSelection(XML::getProperty(npcNode,
+ currentInfo->setTargetSelection(XML::getBoolProperty(npcNode,
"targetSelection", true));
currentInfo->setTargetCursorSize(XML::getProperty(npcNode,