diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-03 15:30:48 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-03 15:30:48 +0000 |
| commit | 29a426dac900b815634989355199bd6d7bce4fae (patch) | |
| tree | b978d25942716a90fc9109d8a1db0f161e143c57 | |
| parent | ff179091355023a5875a48e3af447c184c3fe52c (diff) | |
| download | hercules-29a426dac900b815634989355199bd6d7bce4fae.tar.gz hercules-29a426dac900b815634989355199bd6d7bce4fae.tar.bz2 hercules-29a426dac900b815634989355199bd6d7bce4fae.tar.xz hercules-29a426dac900b815634989355199bd6d7bce4fae.zip | |
- Some adjustments so that the last-skill-used will be correctly cleared when your combo-time ends.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8101 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b50a46a3e..aef626250 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,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.
2006/08/03
+ * Some adjustments so that the last-skill-used will be correctly cleared
+ when your combo-time ends. [Skotlex]
* Fix a bug in atcommand_charspeed [Toms]
* Fixed a logic error preventing from cooking anything [DracoRPG]
* Cleaned up the last NJ update code. [Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c index ec1c43983..44489790d 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1892,11 +1892,11 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds case TK_STORMKICK: case TK_DOWNKICK: case TK_COUNTER: - //set this skill as previous one. - sd->skillid_old = skillid; - sd->skilllv_old = skilllv; if (pc_famerank(sd->char_id,MAPID_TAEKWON)) { //Extend combo time. + sd->skillid_old = skillid; //Set as previous so you can't repeat + sd->skilllv_old = skilllv; + sd->sc.data[SC_COMBO].val1 = skillid; //Update combo-skill delete_timer(sd->sc.data[SC_COMBO].timer, status_change_timer); sd->sc.data[SC_COMBO].timer = add_timer( tick+sd->sc.data[SC_COMBO].val4, |