- Cleaned up some of the pet related @/# commands, same for some script commands.

- Moved s_pet structure from map_session_data to pet_data, this enabled the removal of a few redundant values in the pet_data structure (name, class, equip)
- Pet offensive skills who's inf value is self will be casted on the pet now (for stuff like Grand Cross)


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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/map/pet.h b/src/map/pet.h
index 2d461594d..89ff3dbab 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -34,14 +34,14 @@ extern struct pet_db pet_db[MAX_PET_DB];
 enum { PET_CLASS,PET_CATCH,PET_EGG,PET_EQUIP,PET_FOOD };

 

 int pet_create_egg(struct map_session_data *sd, int item_id);

-int pet_hungry_val(struct map_session_data *sd);

+int pet_hungry_val(struct pet_data *pd);

 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 search_petDB_index(int key,int type);

 int pet_hungry_timer_delete(struct pet_data *pd);

-int pet_data_init(struct map_session_data *sd);

-int pet_birth_process(struct map_session_data *sd);

+int pet_data_init(struct map_session_data *sd, struct s_pet *pet);

+int pet_birth_process(struct map_session_data *sd, struct s_pet *pet);

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

 int pet_select_egg(struct map_session_data *sd,short egg_index);

 int pet_catch_process1(struct map_session_data *sd,int target_class);