- 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, 7 deletions

diff --git a/src/map/pet.h b/src/map/pet.h
index feadafdf3..5e4541de0 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -35,14 +35,10 @@ enum { PET_CLASS,PET_CATCH,PET_EGG,PET_EQUIP,PET_FOOD };
 

 int pet_hungry_val(struct map_session_data *sd);

 int pet_target_check(struct map_session_data *sd,struct block_list *bl,int type);

+int pet_unlocktarget(struct pet_data *pd);

 int pet_sc_check(struct map_session_data *sd, int type); //Skotlex

-int pet_stopattack(struct pet_data *pd);

-int pet_changestate(struct pet_data *pd,int state,int type);

-int pet_walktoxy(struct pet_data *pd,int x,int y);

-int pet_stop_walking(struct pet_data *pd,int type);

 int search_petDB_index(int key,int type);

 int pet_hungry_timer_delete(struct map_session_data *sd);

-int pet_remove_map(struct map_session_data *sd);

 int pet_data_init(struct map_session_data *sd);

 int pet_birth_process(struct map_session_data *sd);

 int pet_recv_petdata(int account_id,struct s_pet *p,int flag);

@@ -58,12 +54,14 @@ int pet_food(struct map_session_data *sd);
 int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd);

 int pet_delay_item_drop2(int tid,unsigned int tick,int id,int data);

 int pet_ai_sub_hard_lootsearch(struct block_list *bl,va_list ap);

-int petskill_use(struct pet_data *pd, struct block_list *target, short skill_id, short skill_lv, unsigned int tick); // [Skotlex]

+int pet_attackskill(struct pet_data *pd, int target_id);

 int pet_skill_support_timer(int tid, unsigned int tick, int id, int data); // [Skotlex]

 int pet_skill_bonus_timer(int tid,unsigned int tick,int id,int data); // [Valaris]

 int pet_recovery_timer(int tid,unsigned int tick,int id,int data); // [Valaris]

 int pet_heal_timer(int tid,unsigned int tick,int id,int data); // [Valaris]

-int pet_skillsupport_timer(int tid,unsigned int tick,int id,int data); // [Skotlex]

+

+#define pet_stop_walking(pd, type) { if((pd)->ud.walktimer != -1) unit_stop_walking(&(pd)->bl, type); }

+#define pet_stop_attack(pd) { if((pd)->ud.attacktimer != -1) unit_stop_attack(&(pd)->bl); }

 

 int read_petdb(void);

 int do_init_pet(void);