summaryrefslogtreecommitdiff
path: root/src/map/battle.h
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-17 16:23:44 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-17 16:23:44 +0000
commit6ed22f13e76053ac76e0c74a01b62330c7331b71 (patch)
tree32584f96e0b9396ddec2a5164d860756146955f3 /src/map/battle.h
parentc6928fbf500652f9bf894176acbe9cff93199442 (diff)
downloadhercules-6ed22f13e76053ac76e0c74a01b62330c7331b71.tar.gz
hercules-6ed22f13e76053ac76e0c74a01b62330c7331b71.tar.bz2
hercules-6ed22f13e76053ac76e0c74a01b62330c7331b71.tar.xz
hercules-6ed22f13e76053ac76e0c74a01b62330c7331b71.zip
Fixed bShortWeaponDamage to work against cart termination, bugreport:5328
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15593 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.h')
-rw-r--r--src/map/battle.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.h b/src/map/battle.h
index 54b707f08..69728dd68 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -35,7 +35,7 @@ struct block_list;
struct Damage battle_calc_attack(int attack_type,struct block_list *bl,struct block_list *target,int skill_num,int skill_lv,int count);
-int battle_calc_return_damage(struct block_list *bl, struct block_list *src, int *, int flag);
+int battle_calc_return_damage(struct block_list *bl, struct block_list *src, int *, int flag, int skillid);
void battle_drain(struct map_session_data *sd, struct block_list *tbl, int rdamage, int ldamage, int race, int boss);