- 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, 5 insertions, 6 deletions

diff --git a/src/map/skill.h b/src/map/skill.h
index bdb545d22..4fb2c9b40 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -155,6 +155,7 @@ int	skill_get_castdef( int id );
 int	skill_get_weapontype( int id );

 int	skill_get_unit_id(int id,int flag);

 int	skill_get_inf2( int id );

+int	skill_get_castcancel( int id );

 int	skill_get_maxcount( int id );

 int	skill_get_blewcount( int id ,int lv );

 int	skill_get_unit_flag( int id );

@@ -162,12 +163,8 @@ int	skill_get_unit_target( int id );
 int	skill_tree_get_max( int id, int b_class );	// Celest

 const char*	skill_get_name( int id ); 	// [Skotlex]

 

-// スキルの使用

-int skill_use_id( struct map_session_data *sd, int target_id,

-	int skill_num,int skill_lv);

-int skill_use_pos( struct map_session_data *sd,

-	int skill_x, int skill_y, int skill_num, int skill_lv);

-

+int skill_castend_id( int tid, unsigned int tick, int id,int data );

+int skill_castend_pos( int tid, unsigned int tick, int id,int data );

 int skill_castend_map( struct map_session_data *sd,int skill_num, const char *map);

 

 int skill_cleartimerskill(struct block_list *src);

@@ -193,6 +190,8 @@ int skill_unit_ondamaged(struct skill_unit *src,struct block_list *bl,
 

 int skill_castfix( struct block_list *bl, int skill_id, int skill_lv, int time);

 int skill_delayfix( struct block_list *bl, int skill_id, int skill_lv, int time);

+int skill_check_condition( struct map_session_data *sd,int skill, int lv, int type);

+int skill_check_pc_partner(struct map_session_data *sd, int skill_id, int* skill_lv, int range, int cast_flag);

 int skill_check_unit_range(int m,int x,int y,int skillid, int skilllv);

 int skill_check_unit_range2(struct block_list *bl,int m,int x,int y,int skillid, int skilllv);

 // -- moonsoul	(added skill_check_unit_cell)