diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 4aada0be7..375441b40 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -2,6 +2,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +09/05/13 + * Fixed combo wait was not canceled when TK's Kick skill was successfully used. (bugreport:1345) [Inkfish] 09/05/12 * Fixed Aid Potion can heal the Emperium (bugreport:164) [Inkfish] 09/05/11 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); } |