- Undid r16968: SVN Replaced with source:/trunk/src/@16966 (tid:74924).

[16969:16991/trunk/src/] will be re-committed in the next 24 hours.

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

1 files changed, 70 insertions, 70 deletions

diff --git a/src/map/pet.h b/src/map/pet.h
index 3ac849111..b46f55229 100644
--- a/src/map/pet.h
+++ b/src/map/pet.h
@@ -4,98 +4,98 @@
 #ifndef _PET_H_
 #define _PET_H_
 
-#define MAX_PET_DB  300
-#define MAX_PETLOOT_SIZE    30
+#define MAX_PET_DB	300
+#define MAX_PETLOOT_SIZE	30
 
 struct s_pet_db {
-    short class_;
-    char name[NAME_LENGTH],jname[NAME_LENGTH];
-    short itemID;
-    short EggID;
-    short AcceID;
-    short FoodID;
-    int fullness;
-    int hungry_delay;
-    int r_hungry;
-    int r_full;
-    int intimate;
-    int die;
-    int capture;
-    int speed;
-    char s_perfor;
-    int talk_convert_class;
-    int attack_rate;
-    int defence_attack_rate;
-    int change_target_rate;
-    struct script_code *equip_script;
-    struct script_code *pet_script;
+	short class_;
+	char name[NAME_LENGTH],jname[NAME_LENGTH];
+	short itemID;
+	short EggID;
+	short AcceID;
+	short FoodID;
+	int fullness;
+	int hungry_delay;
+	int r_hungry;
+	int r_full;
+	int intimate;
+	int die;
+	int capture;
+	int speed;
+	char s_perfor;
+	int talk_convert_class;
+	int attack_rate;
+	int defence_attack_rate;
+	int change_target_rate;
+	struct script_code *equip_script;
+	struct script_code *pet_script;
 };
 extern struct s_pet_db pet_db[MAX_PET_DB];
 
 enum { PET_CLASS,PET_CATCH,PET_EGG,PET_EQUIP,PET_FOOD };
 
 struct pet_recovery { //Stat recovery
-    enum sc_type type;  //Status Change id
-    unsigned short delay; //How long before curing (secs).
-    int timer;
+	enum sc_type type;	//Status Change id
+	unsigned short delay; //How long before curing (secs).
+	int timer;
 };
 
 struct pet_bonus {
-    unsigned short type; //bStr, bVit?
-    unsigned short val; //Qty
-    unsigned short duration; //in secs
-    unsigned short delay;   //Time before RENEWAL_CAST (secs)
-    int timer;
+	unsigned short type; //bStr, bVit?
+	unsigned short val;	//Qty
+	unsigned short duration; //in secs
+	unsigned short delay;	//Time before RENEWAL_CAST (secs)
+	int timer;
 };
 
 struct pet_skill_attack { //Attack Skill
-    unsigned short id;
-    unsigned short lv;
-    unsigned short div_; //0 = Normal skill. >0 = Fixed damage (lv), fixed div_.
-    unsigned short rate; //Base chance of skill ocurrance (10 = 10% of attacks)
-    unsigned short bonusrate; //How being 100% loyal affects cast rate (10 = At 1000 intimacy->rate+10%
+	unsigned short id;
+	unsigned short lv;
+	unsigned short div_; //0 = Normal skill. >0 = Fixed damage (lv), fixed div_.
+	unsigned short rate; //Base chance of skill ocurrance (10 = 10% of attacks)
+	unsigned short bonusrate; //How being 100% loyal affects cast rate (10 = At 1000 intimacy->rate+10%
 };
 
 struct pet_skill_support { //Support Skill
-    unsigned short id;
-    unsigned short lv;
-    unsigned short hp; //Max HP% for skill to trigger (50 -> 50% for Magnificat)
-    unsigned short sp; //Max SP% for skill to trigger (100 = no check)
-    unsigned short delay; //Time (secs) between being able to recast.
-    int timer;
+	unsigned short id;
+	unsigned short lv;
+	unsigned short hp; //Max HP% for skill to trigger (50 -> 50% for Magnificat)
+	unsigned short sp; //Max SP% for skill to trigger (100 = no check)
+	unsigned short delay; //Time (secs) between being able to recast.
+	int timer;
 };
 
 struct pet_loot {
-    struct item *item;
-    unsigned short count;
-    unsigned short weight;
-    unsigned short max;
+	struct item *item;
+	unsigned short count;
+	unsigned short weight;
+	unsigned short max;
 };
 
 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 s_pet_db *petDB;
-    int pet_hungry_timer;
-    int target_id;
-    struct {
-        unsigned skillbonus : 1;
-    } state;
-    int move_fail_count;
-    unsigned int next_walktime,last_thinktime;
-    short rate_fix; //Support rate as modified by intimacy (1000 = 100%) [Skotlex]
-
-    struct pet_recovery *recovery;
-    struct pet_bonus *bonus;
-    struct pet_skill_attack *a_skill;
-    struct pet_skill_support *s_skill;
-    struct pet_loot *loot;
-
-    struct map_session_data *msd;
+	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 s_pet_db *petDB;
+	int pet_hungry_timer;
+	int target_id;
+	struct {
+		unsigned skillbonus : 1;
+	} state;
+	int move_fail_count;
+	unsigned int next_walktime,last_thinktime;
+	short rate_fix;	//Support rate as modified by intimacy (1000 = 100%) [Skotlex]
+
+	struct pet_recovery* recovery;
+	struct pet_bonus* bonus;
+	struct pet_skill_attack* a_skill;
+	struct pet_skill_support* s_skill;
+	struct pet_loot* loot;
+
+	struct map_session_data *msd;
 };
 
 
@@ -117,7 +117,7 @@ int pet_catch_process2(struct map_session_data *sd,int target_id);
 int pet_get_egg(int account_id,int pet_id,int flag);
 int pet_menu(struct map_session_data *sd,int menunum);
 int pet_change_name(struct map_session_data *sd,char *name);
-int pet_change_name_ack(struct map_session_data *sd, char *name, int flag);
+int pet_change_name_ack(struct map_session_data *sd, char* name, int flag);
 int pet_equipitem(struct map_session_data *sd,int index);
 int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd);
 int pet_attackskill(struct pet_data *pd, int target_id);