diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-27 02:55:24 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-27 02:55:24 +0000 |
| commit | 93dca33bf53ddeba191f553e816ba7bb72774cc0 (patch) | |
| tree | 04a8cb4c44c1d940b39c3d65c795c66cfd89aa73 /src/map/battle.c | |
| parent | 91a25bb1534462030596bcd17784cd91e95cd88a (diff) | |
| download | hercules-93dca33bf53ddeba191f553e816ba7bb72774cc0.tar.gz hercules-93dca33bf53ddeba191f553e816ba7bb72774cc0.tar.bz2 hercules-93dca33bf53ddeba191f553e816ba7bb72774cc0.tar.xz hercules-93dca33bf53ddeba191f553e816ba7bb72774cc0.zip | |
- Applied the necessary changes to make @partyoption reflect it's changes on the alt+p window.
- Some code indentation cleanups.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7905 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index f8f16c2b1..50bde0a58 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2317,7 +2317,7 @@ struct Damage battle_calc_magic_attack( sd->ignore_mdef_ele & (1<<tstatus->def_ele) || sd->ignore_mdef_race & (1<<tstatus->race) || sd->ignore_mdef_race & (is_boss(target)?1<<RC_BOSS:1<<RC_NONBOSS) - )) + )) flag.imdef = 1; } @@ -2348,8 +2348,8 @@ struct Damage battle_calc_magic_attack( ad.damage=battle_attr_fix(src, target, ad.damage, s_ele, tstatus->def_ele, tstatus->ele_lv); if (sd && flag.cardfix) { - short cardfix=100; short t_class = status_get_class(target); + short cardfix=100; cardfix=cardfix*(100+sd->magic_addrace[tstatus->race])/100; if (flag.elefix) |