Follow up r16231 now I *think* I fixed the indentation problem with my IDE
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16232 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
2ee49a207a
commit
59d9e55fbc
@ -6002,7 +6002,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
|
|||||||
struct status_data *status;
|
struct status_data *status;
|
||||||
struct view_data *vd;
|
struct view_data *vd;
|
||||||
int opt_flag, calc_flag, undead_flag, val_flag = 0, tick_time = 0;
|
int opt_flag, calc_flag, undead_flag, val_flag = 0, tick_time = 0;
|
||||||
bool sc_isnew = true;
|
bool sc_isnew = true;
|
||||||
|
|
||||||
nullpo_ret(bl);
|
nullpo_ret(bl);
|
||||||
sc = status_get_sc(bl);
|
sc = status_get_sc(bl);
|
||||||
@ -8275,7 +8275,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
|
|||||||
if((sce=sc->data[type])) {// reuse old sc
|
if((sce=sc->data[type])) {// reuse old sc
|
||||||
if( sce->timer != INVALID_TIMER )
|
if( sce->timer != INVALID_TIMER )
|
||||||
delete_timer(sce->timer, status_change_timer);
|
delete_timer(sce->timer, status_change_timer);
|
||||||
sc_isnew = false;
|
sc_isnew = false;
|
||||||
} else {// new sc
|
} else {// new sc
|
||||||
++(sc->count);
|
++(sc->count);
|
||||||
sce = sc->data[type] = ers_alloc(sc_data_ers, struct status_change_entry);
|
sce = sc->data[type] = ers_alloc(sc_data_ers, struct status_change_entry);
|
||||||
@ -8292,8 +8292,8 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
|
|||||||
if (calc_flag)
|
if (calc_flag)
|
||||||
status_calc_bl(bl,calc_flag);
|
status_calc_bl(bl,calc_flag);
|
||||||
|
|
||||||
if ( sc_isnew && StatusChangeStateTable[type] ) /* non-zero */
|
if ( sc_isnew && StatusChangeStateTable[type] ) /* non-zero */
|
||||||
status_calc_state(bl,sc,( enum scs_flag ) StatusChangeStateTable[type],true);
|
status_calc_state(bl,sc,( enum scs_flag ) StatusChangeStateTable[type],true);
|
||||||
|
|
||||||
|
|
||||||
if(sd && sd->pd)
|
if(sd && sd->pd)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user