Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #698, it's if. The check as option not as priority.

Browse Source 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
This commit is contained in:
Cydh Ramdh 2015-10-20 19:54:36 +07:00
parent fd5e796487
commit 030c4c58c1
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/map/status.c
View File

@ -7745,7 +7745,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
if( sc->data[SC_REFRESH] ) { if( sc->data[SC_REFRESH] ) {
if( type >= SC_COMMON_MIN && type <= SC_COMMON_MAX) // Confirmed. if( type >= SC_COMMON_MIN && type <= SC_COMMON_MAX) // Confirmed.
return 0; // Immune to status ailements return 0; // Immune to status ailments
switch( type ) { switch( type ) {
case SC_DEEPSLEEP: case SC_DEEPSLEEP:
case SC_BURNING: case SC_BURNING:
@ -7763,9 +7763,9 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
return 0; return 0;
} }
} }
else if( sc->data[SC_INSPIRATION] ) { if( sc->data[SC_INSPIRATION] ) {
if( type >= SC_COMMON_MIN && type <= SC_COMMON_MAX ) if( type >= SC_COMMON_MIN && type <= SC_COMMON_MAX )
return 0; // Immune to status ailements return 0; // Immune to status ailments
switch( type ) { switch( type ) {
case SC_BURNING: case SC_BURNING:
case SC_FREEZING: case SC_FREEZING:
@ -7791,9 +7791,9 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
return 0; return 0;
} }
} }
else if( sc->data[SC_KINGS_GRACE] ) { if( sc->data[SC_KINGS_GRACE] ) {
if( type >= SC_COMMON_MIN && type <= SC_COMMON_MAX ) if( type >= SC_COMMON_MIN && type <= SC_COMMON_MAX )
return 0; // Immune to status ailements return 0; // Immune to status ailments
switch( type ) { switch( type ) {
case SC_HALLUCINATION: case SC_HALLUCINATION:
case SC_BURNING: case SC_BURNING:
@ -7806,8 +7806,6 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
} }
} }
sd = BL_CAST(BL_PC, bl);
// Adjust tick according to status resistances // Adjust tick according to status resistances
if( !(flag&(SCSTART_NOAVOID|SCSTART_LOADED)) ) { if( !(flag&(SCSTART_NOAVOID|SCSTART_LOADED)) ) {
tick = status_get_sc_def(src, bl, type, rate, tick, flag); tick = status_get_sc_def(src, bl, type, rate, tick, flag);
@ -7815,6 +7813,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
return 0; return 0;
} }
sd = BL_CAST(BL_PC, bl);
vd = status_get_viewdata(bl); vd = status_get_viewdata(bl);
undead_flag = battle_check_undead(status->race,status->def_ele); undead_flag = battle_check_undead(status->race,status->def_ele);