diff options
| author | Susu <bruant.bastien@gmail.com> | 2013-06-26 12:07:31 +0200 |
|---|---|---|
| committer | Susu <bruant.bastien@gmail.com> | 2013-06-26 12:07:31 +0200 |
| commit | 56e37cb8d74da7c12814df50a1d28f59a9b8dc36 (patch) | |
| tree | c280a8aa3be9bdd329b5de235d24b66667c71393 /src/map/battle.h | |
| parent | 71627e92fbe36c23993456486a308acd0428fd3d (diff) | |
| parent | 1b035a978d52bfc6c17c63bb7afd9210abd4983c (diff) | |
| download | hercules-56e37cb8d74da7c12814df50a1d28f59a9b8dc36.tar.gz hercules-56e37cb8d74da7c12814df50a1d28f59a9b8dc36.tar.bz2 hercules-56e37cb8d74da7c12814df50a1d28f59a9b8dc36.tar.xz hercules-56e37cb8d74da7c12814df50a1d28f59a9b8dc36.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/battle.h')
| -rw-r--r-- | src/map/battle.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/battle.h b/src/map/battle.h index 37968f53a..2b502beaf 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -535,7 +535,9 @@ struct battle_interface { /* skill range criteria */ int (*range_type) (struct block_list *src, struct block_list *target, uint16 skill_id, uint16 skill_lv); int (*calc_base_damage) -#ifdef RENEWAL +/* temporary until malufett is able to adjust the formula */ +//#ifdef RENEWAL +#if 0 (struct block_list *src, struct block_list *bl, uint16 skill_id, uint16 skill_lv, int nk, bool n_ele, short s_ele, short s_ele_, int type, int flag, int flag2); #else (struct status_data *status, struct weapon_atk *wa, struct status_change *sc, unsigned short t_size, struct map_session_data *sd, int flag); |