diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-06 02:26:49 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-06 02:26:49 +0300 |
| commit | df9a705c331da29cb0582539a817f68c79d4f267 (patch) | |
| tree | 56b51fa4e27dca8cda0e36f31009c459cb4ca48c | |
| parent | d8fca9f196ad59be5b211325ac2d70e29379e825 (diff) | |
| download | manaplus-df9a705c331da29cb0582539a817f68c79d4f267.tar.gz manaplus-df9a705c331da29cb0582539a817f68c79d4f267.tar.bz2 manaplus-df9a705c331da29cb0582539a817f68c79d4f267.tar.xz manaplus-df9a705c331da29cb0582539a817f68c79d4f267.zip | |
Fix monster particle effects.
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 4 | ||||
| -rw-r--r-- | src/resources/monsterdb.cpp | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index d234bca6a..528608d7e 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -512,8 +512,8 @@ void BeingHandler::processBeingAction(Net::MessageIn &msg) { if (srcSpeed && srcBeing->getType() == Being::PLAYER) srcBeing->setAttackDelay(srcSpeed); - srcBeing->handleAttack(dstBeing, param1, - static_cast<Being::AttackType>(type)); + // attackid=1, type + srcBeing->handleAttack(dstBeing, param1, 1); if (srcBeing->getType() == Being::PLAYER) srcBeing->setAttackTime(); } diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 2bbd51d5a..3629357d1 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -203,8 +203,9 @@ void MonsterDB::load() const std::string missileParticle = XML::getProperty( spriteNode, "missile-particle", ""); - currentInfo->addAttack(id, spriteAction, hitEffectId, - criticalHitEffectId, effectId, missileParticle); + + currentInfo->addAttack(id, spriteAction, effectId, + hitEffectId, criticalHitEffectId, missileParticle); } else if (xmlNameEqual(spriteNode, "particlefx")) { |