From 6f51acd64405e1f081e1a54a5c3f5c3b5431bc70 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 18 Aug 2006 01:57:08 +0000 Subject: - Applied use of structure regen_data for a unified regen module. Natural and skill-heal is handled by this structure, while sitting-skill-heal is still player dependant (mostly because the other object types can't sit) - Added SCB_REGEN constant to identify status changes which alter regeneration - Modified SC_REGENERATION so that if val4 is set, the status actually blocks regen rather than increase it, this is what now Frenzy uses instead of "canregen_tick" - Cleaned up the status calc code for homun by moving it from status_calc_bl_sub_homun to status_calc_homun (where it should had always been) - Moved the Fleet watk code to status_calc_watk where it belongs. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8334 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/map/mercenary.h') diff --git a/src/map/mercenary.h b/src/map/mercenary.h index 322891d6e..e6c64f55a 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -72,9 +72,6 @@ int search_homunculusDB_index(int key,int type); int merc_menu(struct map_session_data *sd,int menunum); int merc_hom_food(struct map_session_data *sd, struct homun_data *hd); int merc_hom_hungry_timer_delete(struct homun_data *hd); -int merc_natural_heal_timer_delete(struct homun_data *hd); -#define merc_checkoverhp(hd) (hd->battle_status.hp == hd->battle_status.max_hp) -#define merc_checkoversp(hd) (hd->battle_status.sp == hd->battle_status.max_sp) #define merc_stop_walking(hd, type) { if((hd)->ud.walktimer != -1) unit_stop_walking(&(hd)->bl, type); } #define merc_stop_attack(hd) { if((hd)->ud.attacktimer != -1) unit_stop_attack(&(hd)->bl); hd->ud.target = 0; } int read_homunculusdb(void); -- cgit v1.2.3-60-g2f50