From b8526ec6c37e9796c7f829a3c072b71bd21af756 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Wed, 9 Feb 2011 11:27:27 +0000 Subject: * Fixed script command 'bpet' (Pet Incubator) displaying an empty egg list when attempting to hatch a pet while already having one out (bugreport:3313). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14702 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 16 +++++++--------- src/map/script.c | 5 +++++ 2 files changed, 12 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/map/clif.c b/src/map/clif.c index 98bb0821a..4d3ca1b19 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6194,15 +6194,13 @@ int clif_sendegg(struct map_session_data *sd) } WFIFOHEAD(fd, MAX_INVENTORY * 2 + 4); WFIFOW(fd,0)=0x1a6; - if(sd->status.pet_id <= 0) { - for(i=0,n=0;istatus.inventory[i].nameid<=0 || sd->inventory_data[i] == NULL || - sd->inventory_data[i]->type!=IT_PETEGG || - sd->status.inventory[i].amount<=0) - continue; - WFIFOW(fd,n*2+4)=i+2; - n++; - } + for(i=0,n=0;istatus.inventory[i].nameid<=0 || sd->inventory_data[i] == NULL || + sd->inventory_data[i]->type!=IT_PETEGG || + sd->status.inventory[i].amount<=0) + continue; + WFIFOW(fd,n*2+4)=i+2; + n++; } WFIFOW(fd,2)=4+n*2; WFIFOSET(fd,WFIFOW(fd,2)); diff --git a/src/map/script.c b/src/map/script.c index dd19e79e2..df862dcc0 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -9124,6 +9124,11 @@ BUILDIN_FUNC(birthpet) if( sd == NULL ) return 0; + if( sd->status.pet_id ) + {// do not send egg list, when you already have a pet + return 0; + } + clif_sendegg(sd); return 0; } -- cgit v1.2.3-60-g2f50