diff options
| author | shennetsind <ind@henn.et> | 2013-06-13 08:23:15 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-06-13 08:23:15 -0300 |
| commit | 7b6e280c5e35ac9e47f4d843178911496d81679c (patch) | |
| tree | 0d1e9e02f5ee2fd350f1b86613441d1faebf743b /src/map/battle.c | |
| parent | 5e90c5fd3ff133a8f8ba9787d8f83c48840a7a96 (diff) | |
| download | hercules-7b6e280c5e35ac9e47f4d843178911496d81679c.tar.gz hercules-7b6e280c5e35ac9e47f4d843178911496d81679c.tar.bz2 hercules-7b6e280c5e35ac9e47f4d843178911496d81679c.tar.xz hercules-7b6e280c5e35ac9e47f4d843178911496d81679c.zip | |
Revert "Fixed pre-re build warning"
This reverts commit 4b713e7e3eac34339285125d194ae4ff4627fc2a.
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 23423502a..9fa4224f5 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1183,8 +1183,8 @@ int battle_calc_defense(int attack_type, struct block_list *src, struct block_li * def1 = equip def * def2 = status def **/ - defType def1 = status_get_def(target), def2 = tstatus->def2; //Don't use tstatus->def1 due to skill timer reductions. - short vit_def; + defType def1 = status_get_def(target); //Don't use tstatus->def1 due to skill timer reductions. + short def2 = tstatus->def2, vit_def; def1 = status_calc_def2(target, tsc, def1, false); // equip def(RE) def2 = status_calc_def(target, tsc, def2, false); // status def(RE) @@ -1289,7 +1289,8 @@ int battle_calc_defense(int attack_type, struct block_list *src, struct block_li case BF_MAGIC: { - defType mdef = tstatus->mdef, mdef2 = tstatus->mdef2; + defType mdef = tstatus->mdef; + short mdef2= tstatus->mdef2; mdef2 = status_calc_mdef(target, tsc, mdef2, false); // status mdef(RE) mdef = status_calc_mdef2(target, tsc, mdef, false); // equip mde(RE) |