From 7cc504d993fa948ae2e10848993f4552b2d6daaa Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Fri, 27 Jan 2012 18:48:37 +0100 Subject: Fixed the use of custom particle effects for attacks. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tA beingmanager was wrongly using the attack type in the Being::handleAttack() function, which is in fact used to set the attack id. Thus, breaking the attack id given and all its attack parameters. I noticed that while updating the client data for TMW. Reviewed-by: Thorbjørn Lindeijer --- src/net/tmwa/beinghandler.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/net') diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index b74ab3e7..bcfb335f 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -361,7 +361,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) if (dstBeing) dstBeing->takeDamage(srcBeing, param1, Being::HIT); // Perhaps a new skill attack type should be created and used? if (srcBeing) - srcBeing->handleAttack(dstBeing, param1, Being::HIT); + srcBeing->handleAttack(dstBeing, param1); break; } case SMSG_BEING_ACTION: @@ -386,8 +386,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) dstBeing->takeDamage(srcBeing, param1, (Being::AttackType)type); if (srcBeing) - srcBeing->handleAttack(dstBeing, param1, - (Being::AttackType)type); + srcBeing->handleAttack(dstBeing, param1); break; case 0x02: // Sit -- cgit v1.2.3-70-g09d2