From 342e0c608d4062cebdaade95923ee48ed492e4a7 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 17 Apr 2006 18:44:59 +0000 Subject: - Fixed pet being incorrectly removed when it had intimacy 0. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6139 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/clif.c | 2 +- src/map/unit.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index accbe46a3..5470fbf73 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -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. 2006/04/17 + * Fixed pet being incorrectly removed when it had intimacy 0. [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 walked for walk-triggered skills, on-chase skill triggers are now done diff --git a/src/map/clif.c b/src/map/clif.c index a295e68a9..18b09da95 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8044,7 +8044,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) clif_set0199(fd,3); // 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); clif_spawn(&sd->pd->bl); clif_send_petdata(sd,0,0); diff --git a/src/map/unit.c b/src/map/unit.c index c8e3738b6..61420d43e 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1606,7 +1606,7 @@ int unit_remove_map(struct block_list *bl, int clrtype) { map_freeblock_unlock(); return 0; } - if (sd->bl.m != bl->m && sd->pet.intimate <= 0) + if (sd->pet.intimate <= 0) { //Remove pet. intif_delete_petdata(sd->status.pet_id); sd->status.pet_id = 0; -- cgit v1.2.3-70-g09d2