From b98423cf76290dfd3b6ee8e0fc32bbf78068b382 Mon Sep 17 00:00:00 2001 From: ultramage Date: Mon, 18 May 2009 07:24:58 +0000 Subject: status calc code cleanup * Inverted the status calc code order, so that status_calc_bl optionally invokes status_calc_pc/mob/whatever instead of every status_calc_* calling status_calc_bl. * Inlined functions status_calc_bl_sub_pc, status_calc_bl_sub_hom and status_calc_bl_sub_mer into status_calc_bl. * Restructured status_calc_bl to require as little bl type-specific branching as possible. * Split status_calc_bl into two layers - the inner does the battle status calculations, while the outer deals with running appropriate base status calculations, remembering old values and handling client updates. * The status_calc_bl function is now the single entry-point for all status calculations. * status_calc_bl will now trigger a client update only on attributes that actually changed. * If hp or sp changes during status_calc_bl, it will now properly refresh on the client. * Removed SCB_PC, now SCB_ALL should be used instead. * Revived the unused status calc flag SCB_BASE to indicate that a base status recalculation should be done first (that's what the status_calc_* functions are for). * Defined a new symbolic bitmask SCB_BATTLE (SCB_ALL - SCB_BASE) in case someone needs to only calculate the battle status (currently unused). Please report any issues with this update. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13789 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/status.h | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'src/map/status.h') diff --git a/src/map/status.h b/src/map/status.h index 1a5efe514..e127f8f5e 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -784,8 +784,8 @@ enum scb_flag SCB_RANGE = 0x10000000, SCB_REGEN = 0x20000000, SCB_DYE = 0x40000000, // force cloth-dye change to 0 to avoid client crashes. - SCB_PC = 0x80000000, + SCB_BATTLE = 0x3FFFFFFE, SCB_ALL = 0x3FFFFFFF }; @@ -992,12 +992,19 @@ int status_change_timer_sub(struct block_list* bl, va_list ap); int status_change_clear(struct block_list* bl, int type); int status_change_clear_buffs(struct block_list* bl, int type); -void status_calc_bl(struct block_list *bl, unsigned long flag); -int status_calc_mob(struct mob_data* md, bool first); -int status_calc_pet(struct pet_data* pd, bool first); -int status_calc_pc(struct map_session_data* sd, bool first); -int status_calc_homunculus(struct homun_data *hd, bool first); -int status_calc_mercenary(struct mercenary_data *md, bool first); +#define status_calc_bl(bl, flag) status_calc_bl_(bl, flag, false) +#define status_calc_mob(md, first) status_calc_bl_(&(md)->bl, SCB_ALL, first) +#define status_calc_pet(pd, first) status_calc_bl_(&(pd)->bl, SCB_ALL, first) +#define status_calc_pc(sd, first) status_calc_bl_(&(sd)->bl, SCB_ALL, first) +#define status_calc_homunculus(hd, first) status_calc_bl_(&(hd)->bl, SCB_ALL, first) +#define status_calc_mercenary(md, first) status_calc_bl_(&(md)->bl, SCB_ALL, first) + +void status_calc_bl_(struct block_list *bl, enum scb_flag flag, bool first); +int status_calc_mob_(struct mob_data* md, bool first); +int status_calc_pet_(struct pet_data* pd, bool first); +int status_calc_pc_(struct map_session_data* sd, bool first); +int status_calc_homunculus_(struct homun_data *hd, bool first); +int status_calc_mercenary_(struct mercenary_data *md, bool first); void status_calc_misc(struct block_list *bl, struct status_data *status, int level); void status_calc_regen(struct block_list *bl, struct status_data *status, struct regen_data *regen); -- cgit v1.2.3-70-g09d2