summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-06 02:26:49 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-06 02:26:49 +0300
commitdf9a705c331da29cb0582539a817f68c79d4f267 (patch)
tree56b51fa4e27dca8cda0e36f31009c459cb4ca48c /src
parentd8fca9f196ad59be5b211325ac2d70e29379e825 (diff)
downloadplus-df9a705c331da29cb0582539a817f68c79d4f267.tar.gz
plus-df9a705c331da29cb0582539a817f68c79d4f267.tar.bz2
plus-df9a705c331da29cb0582539a817f68c79d4f267.tar.xz
plus-df9a705c331da29cb0582539a817f68c79d4f267.zip
Fix monster particle effects.
Diffstat (limited to 'src')
-rw-r--r--src/net/ea/beinghandler.cpp4
-rw-r--r--src/resources/monsterdb.cpp5
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"))
{