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

Minor define cleanups

Browse Source 
* Removed some variable defines that were redefines.
This commit is contained in:
aleos89 2016-10-31 21:58:28 -04:00
parent c1d9520019
commit dc8d466b03
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/map/skill.c
View File

@ -5085,20 +5085,16 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
break; break;
#endif #endif
case RK_DRAGONBREATH_WATER: case RK_DRAGONBREATH_WATER:
case RK_DRAGONBREATH: { case RK_DRAGONBREATH:
struct status_change *tsc2 = NULL; if( tsc->data[SC_HIDING] )
if( (tsc2 = status_get_sc(bl)) && (tsc2->data[SC_HIDING] )) { clif_skill_nodamage(src,src,skill_id,skill_lv,1);
clif_skill_nodamage(src,src,skill_id,skill_lv,1); else
} else skill_attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag);
skill_attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag);
}
break; break;
case NPC_SELFDESTRUCTION: { case NPC_SELFDESTRUCTION:
struct status_change *tsc2 = NULL; if( tsc->data[SC_HIDING] )
if( (tsc2 = status_get_sc(bl)) && tsc2->data[SC_HIDING] )
break; break;
}
case HVAN_EXPLOSION: case HVAN_EXPLOSION:
if (src != bl) if (src != bl)
skill_attack(BF_MISC,src,src,bl,skill_id,skill_lv,tick,flag); skill_attack(BF_MISC,src,src,bl,skill_id,skill_lv,tick,flag);
@ -5558,15 +5554,13 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
} }
break; break;
case SO_POISON_BUSTER: { case SO_POISON_BUSTER:
struct status_change *tsc2 = status_get_sc(bl); if( tsc && tsc->data[SC_POISON] ) {
if( tsc2 && tsc2->data[SC_POISON] ) { skill_attack(skill_get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag);
skill_attack(skill_get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag); status_change_end(bl, SC_POISON, INVALID_TIMER);
status_change_end(bl, SC_POISON, INVALID_TIMER);
}
else if( sd )
clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
} }
else if( sd )
clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0);
break; break;
case GN_SPORE_EXPLOSION: case GN_SPORE_EXPLOSION:
@ -5660,14 +5654,13 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
case EL_TIDAL_WEAPON: case EL_TIDAL_WEAPON:
if( src->type == BL_ELEM ) { if( src->type == BL_ELEM ) {
struct elemental_data *ele = BL_CAST(BL_ELEM,src); struct elemental_data *ele = BL_CAST(BL_ELEM,src);
struct status_change *sc2 = status_get_sc(&ele->bl); struct status_change *tsc_ele = status_get_sc(&ele->bl);
struct status_change *tsc2 = status_get_sc(bl);
sc_type type = status_skill2sc(skill_id), type2; sc_type type = status_skill2sc(skill_id), type2;
type2 = type-1; type2 = type-1;
clif_skill_nodamage(src,battle_get_master(src),skill_id,skill_lv,1); clif_skill_nodamage(src,battle_get_master(src),skill_id,skill_lv,1);
clif_skill_damage(src, src, tick, status_get_amotion(src), 0, -30000, 1, skill_id, skill_lv, DMG_SKILL); clif_skill_damage(src, src, tick, status_get_amotion(src), 0, -30000, 1, skill_id, skill_lv, DMG_SKILL);
if( (sc2 && sc2->data[type2]) || (tsc2 && tsc2->data[type]) ) { if( (tsc_ele && tsc_ele->data[type2]) || (tsc && tsc->data[type]) ) {
elemental_clean_single_effect(ele, skill_id); elemental_clean_single_effect(ele, skill_id);
} }
if( rnd()%100 < 50 ) if( rnd()%100 < 50 )