diff options
author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-03 10:20:13 +0000 |
---|---|---|
committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-03 10:20:13 +0000 |
commit | 0e27de90f75e1cfa3e79ef0379a64a2d6ba9253e (patch) | |
tree | f8b29a774541b242efeade22cc1d14d1938900a0 /src/map/unit.c | |
parent | 41ea0dda0d67e286405543064f4e49e8543951d6 (diff) | |
download | hercules-0e27de90f75e1cfa3e79ef0379a64a2d6ba9253e.tar.gz hercules-0e27de90f75e1cfa3e79ef0379a64a2d6ba9253e.tar.bz2 hercules-0e27de90f75e1cfa3e79ef0379a64a2d6ba9253e.tar.xz hercules-0e27de90f75e1cfa3e79ef0379a64a2d6ba9253e.zip |
* Block equipments switching for some skills (bugreport:2900)
- cannot change equipments during Arrow Vulcan's cast time
- cannot change equipments within Desperado's attack duration
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13724 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
-rw-r--r-- | src/map/unit.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 577dc8ae7..bd2997723 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1072,6 +1072,14 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh ud->canact_tick = tick + casttime + 100; if ( battle_config.display_status_timers && sd ) clif_status_change(src, SI_ACTIONDELAY, 1, casttime); + if( sd ) + { + switch( skill_num ) + { + case CG_ARROWVULCAN: + sd->canequip_tick = tick + casttime; + } + } ud->skilltarget = target_id; ud->skillx = 0; ud->skilly = 0; @@ -1179,6 +1187,14 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, sh ud->canact_tick = tick + casttime + 100; if ( battle_config.display_status_timers && sd ) clif_status_change(src, SI_ACTIONDELAY, 1, casttime); +// if( sd ) +// { +// switch( skill_num ) +// { +// case ????: +// sd->canequip_tick = tick + casttime; +// } +// } ud->skillid = skill_num; ud->skilllv = skill_lv; ud->skillx = skill_x; @@ -1597,6 +1613,8 @@ int unit_skillcastcancel(struct block_list *bl,int type) ud->canact_tick = tick; if ( battle_config.display_status_timers && sd ) clif_status_change(bl, SI_ACTIONDELAY, 0, 0); + if( sd ) + sd->canequip_tick = tick; if(type&1 && sd) skill = sd->skillid_old; |