diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-12 13:35:32 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-12 13:35:32 +0300 |
| commit | dbf80cecba66c3171ccebb6c22d85c3b52637882 (patch) | |
| tree | 18757d1b8237c4f5e5580fe9de5b67d4b011ac25 /src/resources/db/monsterdb.cpp | |
| parent | 18ba68228c2a8bce02a7bce1569be9998570d5f2 (diff) | |
| download | mv-dbf80cecba66c3171ccebb6c22d85c3b52637882.tar.gz mv-dbf80cecba66c3171ccebb6c22d85c3b52637882.tar.bz2 mv-dbf80cecba66c3171ccebb6c22d85c3b52637882.tar.xz mv-dbf80cecba66c3171ccebb6c22d85c3b52637882.zip | |
fix compilation warnings.
Diffstat (limited to 'src/resources/db/monsterdb.cpp')
| -rw-r--r-- | src/resources/db/monsterdb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp index 1fc767a2b..9b9112f0f 100644 --- a/src/resources/db/monsterdb.cpp +++ b/src/resources/db/monsterdb.cpp @@ -208,7 +208,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName) } else if (xmlNameEqual(spriteNode, "attack")) { - const int id = XML::getProperty(spriteNode, "id", 0); + const int attackId = XML::getProperty(spriteNode, "id", 0); const int effectId = XML::getProperty( spriteNode, "effect-id", paths.getIntValue("effectId")); const int hitEffectId = XML::getProperty(spriteNode, @@ -229,7 +229,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName) const std::string missileParticle = XML::getProperty( spriteNode, "missile-particle", ""); - currentInfo->addAttack(id, spriteAction, skySpriteAction, + currentInfo->addAttack(attackId, spriteAction, skySpriteAction, waterSpriteAction, effectId, hitEffectId, criticalHitEffectId, missEffectId, missileParticle); } |