summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-13 09:04:38 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-13 09:04:38 +0000
commit00ea0c3f5908cddb310f9c720087facf5ec746e6 (patch)
tree3d43f2ed7d300a772580a5da4286f307c517cb0e /src
parent7a4307b8cc339471a0a7e969e66d34c41fa57141 (diff)
downloadhercules-00ea0c3f5908cddb310f9c720087facf5ec746e6.tar.gz
hercules-00ea0c3f5908cddb310f9c720087facf5ec746e6.tar.bz2
hercules-00ea0c3f5908cddb310f9c720087facf5ec746e6.tar.xz
hercules-00ea0c3f5908cddb310f9c720087facf5ec746e6.zip
* Fixed combo wait was not canceled when Kick skill was successfully used. (bugreport:1345)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13765 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index e84562496..9449c6447 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1634,6 +1634,8 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
status_change_timer, src->id, SC_COMBO);
break;
}
+ unit_cancel_combo(src); // Cancel combo wait
+ break;
default:
status_change_end(src,SC_COMBO,-1);
}