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

- Fixed pet being incorrectly removed when it had intimacy 0.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6139 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-04-17 18:44:59 +00:00
parent 7a7b9fd5c3
commit cbea996edc
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/17 2006/04/17
* Fixed pet being incorrectly removed when it had intimacy 0. [Skotlex]
* Some cleanup in the TK_RUN related code. [Skotlex] * Some cleanup in the TK_RUN related code. [Skotlex]
* Added variable walk_count to unit_data to be use as a counter for cells * Added variable walk_count to unit_data to be use as a counter for cells
walked for walk-triggered skills, on-chase skill triggers are now done walked for walk-triggered skills, on-chase skill triggers are now done

2
src/map/clif.c
View File

@ -8044,7 +8044,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
clif_set0199(fd,3); clif_set0199(fd,3);
// pet // pet
if(sd->status.pet_id > 0 && sd->pd && sd->pet.intimate > 0) { if(sd->status.pet_id > 0 && sd->pd) {
map_addblock(&sd->pd->bl); map_addblock(&sd->pd->bl);
clif_spawn(&sd->pd->bl); clif_spawn(&sd->pd->bl);
clif_send_petdata(sd,0,0); clif_send_petdata(sd,0,0);

2
src/map/unit.c
View File

@ -1606,7 +1606,7 @@ int unit_remove_map(struct block_list *bl, int clrtype) {
map_freeblock_unlock(); map_freeblock_unlock();
return 0; return 0;
} }
if (sd->bl.m != bl->m && sd->pet.intimate <= 0) if (sd->pet.intimate <= 0)
{ //Remove pet. { //Remove pet.
intif_delete_petdata(sd->status.pet_id); intif_delete_petdata(sd->status.pet_id);
sd->status.pet_id = 0; sd->status.pet_id = 0;