- Merged the unit_data structure from jA for handling unit-related data (attack times, walking, auto-attack timers, skill related data)

- Modified unit_skillcastcancel to receive flag&2, which stands for "cancel casting only if current skill is cancellable"
- Battle config options changed from yes/no to BL_TYPE settings: skillrange_by_distance, skill_noreiteration, skill_nofootset, gvg_traps_target_all, skill_log, attack_direction_change, auto_counter_type
- Clif.c will disconnect sessions that send an unknown command packet above 0x30000 instead of just ignoring it.
- Cleaned up/rewrite of the pet ai, same for pet_calc_pos
- Implemented use of mob variable attacked_players as it is used on jA
- Cleaned up error reporting during mob-skill loading to be less spamy with non-loaded mobs.
- Corrected water_height reading. I forgot to give credits to LittleWolf for providing the water-reading function :X


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5707 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 1 insertions, 3 deletions

diff --git a/src/map/npc.h b/src/map/npc.h
index 5d41c87a0..8f659eb46 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -32,7 +32,7 @@ int npc_buysellsel(struct map_session_data *,int,int);
 int npc_buylist(struct map_session_data *,int,unsigned short *);

 int npc_selllist(struct map_session_data *,int,unsigned short *);

 int npc_parse_mob(char *w1,char *w2,char *w3,char *w4);

-int npc_parse_mob2 (struct mob_list *, int cached); // [Wizputer]

+int npc_parse_mob2 (struct spawn_data*, int index); // [Wizputer]

 int npc_parse_warp(char *w1,char *w2,char *w3,char *w4);

 int npc_globalmessage(const char *name,char *mes);

 

@@ -40,8 +40,6 @@ int npc_enable(const char *name,int flag);
 int npc_changename(const char *name, const char *newname, short look); // [Lance]

 struct npc_data* npc_name2id(const char *name);

 

-int npc_walktoxy(struct npc_data *nd,int x,int y,int easy); // npc walking [Valaris]

-int npc_stop_walking(struct npc_data *nd,int type);

 int npc_changestate(struct npc_data *nd,int state,int type);

 

 int npc_get_new_npc_id(void);