diff options
| author | Haru <haru@dotalux.com> | 2013-09-25 21:26:54 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-09-25 22:15:53 +0200 |
| commit | afcad494411995396b906f214d1c4ffcf485cc0a (patch) | |
| tree | e70b21658276ddef885322b7c9b18935b6c0235e /src/map/battle.h | |
| parent | 13afb7e0bf35bacc9c90c7dffe34120ddd2fd099 (diff) | |
| download | hercules-afcad494411995396b906f214d1c4ffcf485cc0a.tar.gz hercules-afcad494411995396b906f214d1c4ffcf485cc0a.tar.bz2 hercules-afcad494411995396b906f214d1c4ffcf485cc0a.tar.xz hercules-afcad494411995396b906f214d1c4ffcf485cc0a.zip | |
Renamed local variables that would conflict with a rename of iStatus to status
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/battle.h')
| -rw-r--r-- | src/map/battle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/battle.h b/src/map/battle.h index f56bff3be..6909160c9 100644 --- a/src/map/battle.h +++ b/src/map/battle.h @@ -546,7 +546,7 @@ struct battle_interface { #ifdef RENEWAL (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); + (struct status_data *st, struct weapon_atk *wa, struct status_change *sc, unsigned short t_size, struct map_session_data *sd, int flag); #endif struct Damage (*calc_misc_attack) (struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv,int mflag); struct Damage (*calc_magic_attack) (struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv,int mflag); |