diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-07 14:57:08 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-07 21:38:21 +0300 |
| commit | ae550d179c25e149f7e8a8d70011b364fb0d85d6 (patch) | |
| tree | c4dabe3e38afc8b343e3946202eb6fa5f30a18a9 /src/resources | |
| parent | 2566e68d2502d39c9f7c9d83ce4b281e2834fe29 (diff) | |
| download | manaplus-ae550d179c25e149f7e8a8d70011b364fb0d85d6.tar.gz manaplus-ae550d179c25e149f7e8a8d70011b364fb0d85d6.tar.bz2 manaplus-ae550d179c25e149f7e8a8d70011b364fb0d85d6.tar.xz manaplus-ae550d179c25e149f7e8a8d70011b364fb0d85d6.zip | |
some fixes after auto check.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/beinginfo.cpp | 4 | ||||
| -rw-r--r-- | src/resources/npcdb.cpp | 2 |
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, |