summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-06-13 07:37:59 -0300
committerEuphy <euphy@rathena.org>2013-06-15 15:52:00 -0400
commit0d6335f7ebff81f65a28568cf6fc1e24deaf96d1 (patch)
tree4b82cb12a6973e6ae93ecafd1b8925f391ea41a5 /src/map/battle.c
parent267ceb503f1e8002959f0a5b7ea49de61d1d572c (diff)
downloadhercules-0d6335f7ebff81f65a28568cf6fc1e24deaf96d1.tar.gz
hercules-0d6335f7ebff81f65a28568cf6fc1e24deaf96d1.tar.bz2
hercules-0d6335f7ebff81f65a28568cf6fc1e24deaf96d1.tar.xz
hercules-0d6335f7ebff81f65a28568cf6fc1e24deaf96d1.zip
Fixed pre-re build warning
Special Thanks to ossi0110 Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 9fa4224f5..23423502a 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); //Don't use tstatus->def1 due to skill timer reductions.
- short def2 = tstatus->def2, vit_def;
+ defType def1 = status_get_def(target), def2 = tstatus->def2; //Don't use tstatus->def1 due to skill timer reductions.
+ short 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,8 +1289,7 @@ int battle_calc_defense(int attack_type, struct block_list *src, struct block_li
case BF_MAGIC:
{
- defType mdef = tstatus->mdef;
- short mdef2= tstatus->mdef2;
+ defType mdef = tstatus->mdef, 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)