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

Resolved a compile warning on pre-renewal (#2625)

Browse Source 
* Fixes #2624.
* Resolves a switch statement warning with only a default case for pre-renewal builds.
Thanks to @Daegaladh!
This commit is contained in:
Aleos 2017-11-21 17:35:32 -05:00 committed by GitHub
parent 3ce3bc3fed
commit cdbb14b90d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/map/battle.cpp
View File

@ -6318,20 +6318,19 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
//Apply DAMAGE_DIV_FIX and check for min damage //Apply DAMAGE_DIV_FIX and check for min damage
ad = battle_apply_div_fix(ad, skill_id); ad = battle_apply_div_fix(ad, skill_id);
switch(skill_id) { // These skills will do a GVG fix later
#ifdef RENEWAL #ifdef RENEWAL
switch(skill_id) {
case ASC_BREAKER: case ASC_BREAKER:
case CR_ACIDDEMONSTRATION: case CR_ACIDDEMONSTRATION:
return ad; //These skills will do a GVG fix later return ad; //These skills will do a GVG fix later
#endif
default:
ad.damage = battle_calc_damage(src,target,&ad,ad.damage,skill_id,skill_lv);
if (map_flag_gvg2(target->m))
ad.damage = battle_calc_gvg_damage(src,target,ad.damage,skill_id,ad.flag);
else if (map[target->m].flag.battleground)
ad.damage = battle_calc_bg_damage(src,target,ad.damage,skill_id,ad.flag);
break;
} }
#endif
ad.damage = battle_calc_damage(src,target,&ad,ad.damage,skill_id,skill_lv);
if (map_flag_gvg2(target->m))
ad.damage = battle_calc_gvg_damage(src,target,ad.damage,skill_id,ad.flag);
else if (map[target->m].flag.battleground)
ad.damage = battle_calc_bg_damage(src,target,ad.damage,skill_id,ad.flag);
// Skill damage adjustment // Skill damage adjustment
#ifdef ADJUST_SKILL_DAMAGE #ifdef ADJUST_SKILL_DAMAGE