From c6b5397e443179b28e6e094452fd4966ceb36798 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 23 Jan 2007 14:08:34 +0000 Subject: - Added view_data support to mercenary.*, so that the Homunculus entries are no longer required on the mob_db. - Removed homunculus entries from mob_db. - Added the status icon to NPC_CHANGEUNDEAD and the Flee/Hit foods - Corrected the check that lets you walk when vending/chatting/etc. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9697 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map/mercenary.h') diff --git a/src/map/mercenary.h b/src/map/mercenary.h index 91ce62a33..b7b0dd635 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -43,13 +43,13 @@ enum { SP_INTIMATE = 0x100, SP_HUNGRY = 0x200 }; + +#define homdb_checkid(id) (id >= HM_CLASS_BASE && id <= HM_CLASS_MAX) + // merc_is_hom_alive(struct homun_data *) #define merc_is_hom_active(x) (x && x->homunculus.vaporize != 1 && x->battle_status.hp > 0) int do_init_merc(void); int merc_hom_recv_data(int account_id, struct s_homunculus *sh, int flag); //albator -void merc_load_sub(struct homun_data *hd, struct map_session_data *sd); -void merc_load_exptables(void); -char *merc_hom_skill_get_name(int id); void merc_damage(struct homun_data *hd,struct block_list *src,int hp,int sp); int merc_hom_dead(struct homun_data *hd, struct block_list *src); void merc_hom_skillup(struct homun_data *hd,int skillnum); -- cgit v1.2.3-60-g2f50