From 133aa062bf0e7629f9260165fe5004a1f1cae690 Mon Sep 17 00:00:00 2001 From: skotlex Date: Sat, 25 Mar 2006 00:05:47 +0000 Subject: - Small change that SHOULD fix the pet duplication. Fixing pet incubator still isn't done... git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5741 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pet.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/map/pet.c') diff --git a/src/map/pet.c b/src/map/pet.c index 67049d271..67d457e55 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -379,6 +379,7 @@ int pet_return_egg(struct map_session_data *sd) if(battle_config.pet_status_support && sd->pet.intimate > 0) status_calc_pc(sd,0); memset(&sd->pet, 0, sizeof(struct s_pet)); + sd->status.pet_id = 0; sd->pet.incuvate = 1; sd->petDB = NULL; } @@ -512,6 +513,8 @@ int pet_recv_petdata(int account_id,struct s_pet *p,int flag) if (battle_config.error_log) ShowError("pet_recv_petdata: Hatching pet (%d:%s) aborted, couldn't find egg in inventory for removal!\n",p->pet_id, p->name); sd->status.pet_id = 0; + memset(&sd->pet,0,sizeof(struct s_pet)); + sd->pet.incuvate = 1; return 1; } if (!pet_birth_process(sd)) //Pet hatched. Delete egg. -- cgit v1.2.3-70-g09d2