summaryrefslogtreecommitdiff
path: root/src/map/battle.h
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-25 19:39:18 -0200
committershennetsind <ind@henn.et>2013-11-25 19:39:18 -0200
commit7e7f5cf3bef75d826875ef3bda43479e1fb499a4 (patch)
tree8431fdcfd4fa8ff2bfa017fa7b6c25d0e68443e8 /src/map/battle.h
parent61841e7861f63d98ecb417e2bf17135970b79c5a (diff)
downloadhercules-7e7f5cf3bef75d826875ef3bda43479e1fb499a4.tar.gz
hercules-7e7f5cf3bef75d826875ef3bda43479e1fb499a4.tar.bz2
hercules-7e7f5cf3bef75d826875ef3bda43479e1fb499a4.tar.xz
hercules-7e7f5cf3bef75d826875ef3bda43479e1fb499a4.zip
calc_return_damage cleanup & fixes
Fixed skill_id not being passed and thus causing some conditions to never be met, dropped some other conditions that would never be met and thus were just wasting space. Moved clif damage outside so that its only used once and with the overall damage instead of several times aggregating the combined delay. Special Thanks to Haruna. Signed-off-by: shennetsind <ind@henn.et>
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 a8b291818..645b1761f 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -527,7 +527,7 @@ struct battle_interface {
/* drain damage */
void (*drain) (struct map_session_data *sd, struct block_list *tbl, int64 rdamage, int64 ldamage, int race, int boss);
/* damage return/reflect */
- int64 (*calc_return_damage) (struct block_list *bl, struct block_list *src, int64 *, int flag, uint16 skill_id, int *rdelay);
+ int64 (*calc_return_damage) (struct block_list *target, struct block_list *src, int64 damage, int flag, uint16 skill_id);
/* attribute rate */
int (*attr_ratio) (int atk_elem, int def_type, int def_lv);
/* applies attribute modifiers */