summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-23 11:13:49 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-23 11:13:49 +0000
commit959fcb568df0534989eba2f23870a12aaecb91a2 (patch)
tree430cee6221fbfd1b09a8ae5a16ac8c21284e7f42 /src/map/battle.c
parent7d7f935061145b4f387ce904ec3d1c44612341bb (diff)
downloadhercules-959fcb568df0534989eba2f23870a12aaecb91a2.tar.gz
hercules-959fcb568df0534989eba2f23870a12aaecb91a2.tar.bz2
hercules-959fcb568df0534989eba2f23870a12aaecb91a2.tar.xz
hercules-959fcb568df0534989eba2f23870a12aaecb91a2.zip
* Various small cleanups.
- Fixed truncation warnings in @statuspoint, @skillpoint and @str/@agi/@vit/@int/@dex/@luk (since r14436). - Fixed data type inconsistency in @statuspoint and @skillpoint (since r5762, related r13541). - Silenced truncation warnings in CR_ACIDDEMONSTRATION damage calculation and cardfix application (since r13700). - Reformatted unit_blown to make it look cleaner (follow up to r14492). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14493 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index acd61b23f..5c6da69e3 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2770,7 +2770,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
break;
case CR_ACIDDEMONSTRATION: // updated the formula based on a Japanese formula found to be exact [Reddozen]
if(tstatus->vit+sstatus->int_) //crash fix
- md.damage = (int64)7*tstatus->vit*sstatus->int_*sstatus->int_ / (10*(tstatus->vit+sstatus->int_));
+ md.damage = (int)((int64)7*tstatus->vit*sstatus->int_*sstatus->int_ / (10*(tstatus->vit+sstatus->int_)));
else
md.damage = 0;
if (tsd) md.damage>>=1;
@@ -2886,7 +2886,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
cardfix=cardfix*(100-tsd->long_attack_def_rate)/100;
if (cardfix != 10000)
- md.damage=(int64)md.damage*cardfix/10000;
+ md.damage=(int)((int64)md.damage*cardfix/10000);
}
if (sd && (i = pc_skillatk_bonus(sd, skill_num)))