diff options
| author | Haru <haru@dotalux.com> | 2016-02-20 15:59:58 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-02-20 15:59:58 +0100 |
| commit | 71968e6985a2d6798505b84bc7ed22f5c6bfcfac (patch) | |
| tree | 4740ae636d410980f379cc4bb3a969b49451c7c7 /src/map/battle.c | |
| parent | 5b74faa8afd04771af7acb918072ea71a3db475f (diff) | |
| parent | b7f772294594c40ef1e18f9c044e5c4fe6b490f4 (diff) | |
| download | hercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.tar.gz hercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.tar.bz2 hercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.tar.xz hercules-71968e6985a2d6798505b84bc7ed22f5c6bfcfac.zip | |
Merge pull request #1162 from 4144/flags
Add some compiler warning flags and fix new warnings
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 44adef051..4cf9a5b54 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4783,12 +4783,10 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list //Assuming that 99% of the cases we will not need to check for the flag.rh... we don't. //ATK_RATE scales the damage. 100 = no change. 50 is halved, 200 is doubled, etc #define ATK_RATE( a ) do { int64 temp__ = (a); wd.damage= wd.damage*temp__/100 ; if(flag.lh) wd.damage2= wd.damage2*temp__/100; } while(0) -#define ATK_RATE2( a , b ) do { wd.damage= wd.damage*(a)/100 ; if(flag.lh) wd.damage2= wd.damage2*(b)/100; } while(0) #define ATK_RATER(a) ( wd.damage = wd.damage*(a)/100 ) #define ATK_RATEL(a) ( wd.damage2 = wd.damage2*(a)/100 ) //Adds dmg%. 100 = +100% (double) damage. 10 = +10% damage #define ATK_ADDRATE( a ) do { int64 temp__ = (a); wd.damage+= wd.damage*temp__/100; if(flag.lh) wd.damage2+= wd.damage2*temp__/100; } while(0) -#define ATK_ADDRATE2( a , b ) do { wd.damage+= wd.damage*(a)/100 ; if(flag.lh) wd.damage2+= wd.damage2*(b)/100; } while(0) //Adds an absolute value to damage. 100 = +100 damage #define ATK_ADD( a ) do { int64 temp__ = (a); wd.damage += temp__; if (flag.lh) wd.damage2 += temp__; } while(0) #define ATK_ADD2( a , b ) do { wd.damage += (a); if (flag.lh) wd.damage2 += (b); } while(0) @@ -6373,11 +6371,9 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t return wd.dmg_lv; } #undef ATK_RATE -#undef ATK_RATE2 #undef ATK_RATER #undef ATK_RATEL #undef ATK_ADDRATE -#undef ATK_ADDRATE2 #undef ATK_ADD #undef ATK_ADD2 #undef GET_NORMAL_ATTACK |