- 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, 1 insertions, 4 deletions

diff --git a/src/map/map.h b/src/map/map.h
index 37a0b9c54..f2403ec1e 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -749,7 +749,6 @@ struct map_session_data {
 	char message[MESSAGE_SIZE];

 	struct vending vending[MAX_VENDING];

 

-	struct s_pet pet;

 	struct pet_data *pd;

 

 	struct s_homunculus homunculus ;	//[orn]

@@ -961,15 +960,13 @@ struct pet_data {
 	struct block_list bl;

 	struct unit_data ud;

 	struct view_data vd;

+	struct s_pet pet;

 	struct status_data status;

 	struct mob_db *db;

 	struct pet_db *petDB;

 	int pet_hungry_timer;

 	int target_id;

 	short n;

-	short class_;

-	short equip;

-	char name[NAME_LENGTH];

 	struct {

 		unsigned skillbonus : 1;

 	} state;