Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed pet hatching.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5743 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-03-25 02:34:20 +00:00
parent a46ee44135
commit 3c082b1744
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/24 2006/03/24
* Fixed pet hatching. [Skotlex]
* Small change that SHOULD fix the pet duplication issue. [Skotlex] * Small change that SHOULD fix the pet duplication issue. [Skotlex]
* Fixed Warp Portal. [Skotlex] * Fixed Warp Portal. [Skotlex]
* Modified script commands atcommand/charcommand to execute even if there * Modified script commands atcommand/charcommand to execute even if there

16
src/map/pet.c
View File

@ -374,13 +374,13 @@ int pet_return_egg(struct map_session_data *sd)
clif_additem(sd,0,0,flag); clif_additem(sd,0,0,flag);
map_addflooritem(&tmp_item,1,sd->bl.m,sd->bl.x,sd->bl.y,NULL,NULL,NULL,0); map_addflooritem(&tmp_item,1,sd->bl.m,sd->bl.x,sd->bl.y,NULL,NULL,NULL,0);
} }
sd->pet.incuvate = 1;
intif_save_petdata(sd->status.account_id,&sd->pet); intif_save_petdata(sd->status.account_id,&sd->pet);
unit_free(&sd->pd->bl); unit_free(&sd->pd->bl);
if(battle_config.pet_status_support && sd->pet.intimate > 0) if(battle_config.pet_status_support && sd->pet.intimate > 0)
status_calc_pc(sd,0); status_calc_pc(sd,0);
memset(&sd->pet, 0, sizeof(struct s_pet)); memset(&sd->pet, 0, sizeof(struct s_pet));
sd->status.pet_id = 0; sd->status.pet_id = 0;
sd->pet.incuvate = 1;
sd->petDB = NULL; sd->petDB = NULL;
} }
@ -396,11 +396,21 @@ int pet_data_init(struct map_session_data *sd)
Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->msd == sd); Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->msd == sd);
if(sd->status.account_id != sd->pet.account_id || sd->status.char_id != sd->pet.char_id || if(sd->status.account_id != sd->pet.account_id || sd->status.char_id != sd->pet.char_id) {
sd->status.pet_id != sd->pet.pet_id) {
sd->status.pet_id = 0; sd->status.pet_id = 0;
return 1; return 1;
} }
if (sd->status.pet_id != sd->pet.pet_id) {
if (sd->status.pet_id) {
//Wrong pet?? Set incuvate to no and send it back for saving.
sd->pet.incuvate = 1;
intif_save_petdata(sd->status.account_id,&sd->pet);
sd->status.pet_id = 0;
return 1;
}
//The pet_id value was lost? odd... restore it.
sd->status.pet_id = sd->pet.pet_id;
}
i = search_petDB_index(sd->pet.class_,PET_CLASS); i = search_petDB_index(sd->pet.class_,PET_CLASS);
if(i < 0) { if(i < 0) {