diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-02-09 11:27:27 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-02-09 11:27:27 +0000 |
| commit | b8526ec6c37e9796c7f829a3c072b71bd21af756 (patch) | |
| tree | 1301c39e936f5529842a3bdc9e895e43a9fbee93 | |
| parent | c4f7126a6d75662c62242ec23ce76292c3f35470 (diff) | |
| download | hercules-b8526ec6c37e9796c7f829a3c072b71bd21af756.tar.gz hercules-b8526ec6c37e9796c7f829a3c072b71bd21af756.tar.bz2 hercules-b8526ec6c37e9796c7f829a3c072b71bd21af756.tar.xz hercules-b8526ec6c37e9796c7f829a3c072b71bd21af756.zip | |
* 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
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 16 | ||||
| -rw-r--r-- | src/map/script.c | 5 |
3 files changed, 14 insertions, 9 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9b162fa67..689133ab7 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ Date Added +2011/02/09 + * Fixed script command 'bpet' (Pet Incubator) displaying an empty egg list when attempting to hatch a pet while already having one out (bugreport:3313). [Ai4rei] 2011/02/08 * Moved script constant manipulation code into separate functions script_get_constant / script_set_constant. [Ai4rei] - Added protection against overwriting existing names in script constant creation code. 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;i<MAX_INVENTORY;i++){ - if(sd->status.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;i<MAX_INVENTORY;i++){ + if(sd->status.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; } |