From a1fddcf716995eddf1c26e1395c8cc24ce6b3eba Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 30 May 2006 15:29:17 +0000 Subject: - Small optimization in battle_check_target - Disabled ontouch npcs triggering on hidden/chase-walk characters. - Added the SC* code blocks relevant to SC_AVOID, SC_CHANGE, SC_BLOODLUST, SC_FLEET - Added structure status_data to homun_data - Added handling of BL_HOMUNCULUS in status_heal, status_damage. - Cleaned up the homun-submitted code, moved the relevant code to status_calc_homunculus. - Updated map-server Makefile to compile mercenary.* files. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6847 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/map.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/map/map.h') diff --git a/src/map/map.h b/src/map/map.h index a4d64fc05..b323b1a7e 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -944,11 +944,11 @@ 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; char name[NAME_LENGTH]; int id; - short speed; short class_; struct map_session_data *master; //pointer back to its master @@ -960,18 +960,10 @@ struct homun_data { int level; } hskill[4]; //skills (max. 4 for now) - int alive; //does it live - int target_id,attacked_id; - int amotion,dmotion; - short level; - short atk,matk,hit,crit,def,mdef,flee,flee2; //flee2 is not transmitted; lucky flee short regenhp,regensp; - short str,agi,vit,int_,dex,luk; //According to various sources, they do have these though they aren't transfered to client. - short hp,max_hp; - short sp,max_sp; unsigned long exp,exp_next; short skillpts; }; @@ -1476,6 +1468,7 @@ typedef struct flooritem_data TBL_ITEM; typedef struct chat_data TBL_CHAT; typedef struct skill_unit TBL_SKILL; typedef struct pet_data TBL_PET; +typedef struct homun_data TBL_HOMUNCULUS; #define BL_CAST(type_, bl , dest) \ (((bl) == NULL || (bl)->type != type_) ? ((dest) = NULL, 0) : ((dest) = (T ## type_ *)(bl), 1)) -- cgit v1.2.3-70-g09d2