diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-21 23:19:22 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-21 23:19:22 +0000 |
| commit | 5471705b4190f390029d990cda966f95db5d19a7 (patch) | |
| tree | e8bf235065012bb15e08781d7aa531b427ef6bfe /src/map/status.c | |
| parent | eba83e0231886458138a7344ce7beaa32087b6a7 (diff) | |
| download | hercules-5471705b4190f390029d990cda966f95db5d19a7.tar.gz hercules-5471705b4190f390029d990cda966f95db5d19a7.tar.bz2 hercules-5471705b4190f390029d990cda966f95db5d19a7.tar.xz hercules-5471705b4190f390029d990cda966f95db5d19a7.zip | |
Fixed bugreport:5462, Cursed Circle target is no longer able to move.
Also Fixed Cursed Circle effect not going off if status is ended normally.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15743 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/map/status.c b/src/map/status.c index cd70b75e6..4d4aa4421 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -8579,19 +8579,20 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const map_foreachinrange(status_change_timer_sub, bl, skill_get_splash(SR_CURSEDCIRCLE, sce->val1),BL_CHAR, bl, sce, SC_CURSEDCIRCLE_TARGET, gettick()); break; case SC_RAISINGDRAGON: - if( sd && sce->val2 && !pc_isdead(sd) ) - { + if( sd && sce->val2 && !pc_isdead(sd) ) { int i; i = min(sd->spiritball,5); pc_delspiritball(sd, sd->spiritball, 0); status_change_end(bl, SC_EXPLOSIONSPIRITS, -1); - while( i > 0 ) - { + while( i > 0 ) { pc_addspiritball(sd, skill_get_time(MO_CALLSPIRITS, pc_checkskill(sd,MO_CALLSPIRITS)), 5); --i; } } break; + case SC_CURSEDCIRCLE_TARGET: + clif_bladestop(bl, sce->val2, 0); + break; } opt_flag = 1; @@ -9613,8 +9614,7 @@ int status_change_timer_sub(struct block_list* bl, va_list ap) tsc = status_get_sc(bl); - switch( type ) - { + switch( type ) { case SC_SIGHT: /* ƒTƒCƒg */ case SC_CONCENTRATE: status_change_end(bl, SC_HIDING, INVALID_TIMER); @@ -9653,8 +9653,7 @@ int status_change_timer_sub(struct block_list* bl, va_list ap) break; case SC_CURSEDCIRCLE_TARGET: if( tsc && tsc->data[SC_CURSEDCIRCLE_TARGET] && tsc->data[SC_CURSEDCIRCLE_TARGET]->val2 == src->id ) { - status_change_end(bl, type, -1); - clif_bladestop(src, bl->id, 0); + status_change_end(bl, type, -1); } break; } |