From 3731a2ee949a424941f46a653525fcd4bfca0e3f Mon Sep 17 00:00:00 2001 From: ultramage Date: Mon, 24 Mar 2008 21:20:48 +0000 Subject: * Reorganized the contents of the mapserver's header files. - map.h is no longer a generic dumping spot of all the shared structs, and instead, each such structure now resides in its logical component - map.h now only holds mostly map-related things (needs more cleaning) - there's still a lot of room for improvement (reorganization within individual header files, etc...) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12429 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src/map/mercenary.h') diff --git a/src/map/mercenary.h b/src/map/mercenary.h index 95193df0a..2e90786cd 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -4,6 +4,9 @@ #ifndef _MERCENARY_H_ #define _MERCENARY_H_ +#include "status.h" // struct status_data, struct status_change +#include "unit.h" // struct unit_data + struct s_homunculus_db { int base_class, evo_class; char name[NAME_LENGTH]; @@ -24,6 +27,24 @@ enum { SP_HUNGRY = 0x200 }; + +struct homun_data { + struct block_list bl; + struct unit_data ud; + struct view_data *vd; + struct status_data base_status, battle_status; + struct status_change sc; + struct regen_data regen; + struct s_homunculus_db *homunculusDB; //[orn] + struct s_homunculus homunculus ; //[orn] + + struct map_session_data *master; //pointer back to its master + int hungry_timer; //[orn] + unsigned int exp_next; + char blockskill[MAX_SKILL]; // [orn] +}; + + #define homdb_checkid(id) (id >= HM_CLASS_BASE && id <= HM_CLASS_MAX) // merc_is_hom_alive(struct homun_data *) -- cgit v1.2.3-60-g2f50