From 866427aba211c4db96c4f4cf97e159d3abfcac0b Mon Sep 17 00:00:00 2001 From: cannelle Date: Thu, 20 Feb 2014 14:21:39 -0600 Subject: Unit remove from map animation. Follow-up to my previous logout animation fix. Pets, homunculi and mercenaries were not vanishing correctly after CLR_TELEPORT was changed to CLR_RESPAWN. --- src/map/unit.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/map/unit.c b/src/map/unit.c index a7aca10b9..b195d3c91 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -2284,9 +2284,10 @@ int unit_remove_map(struct block_list *bl, clr_type clrtype, const char* file, i void unit_remove_map_pc(struct map_session_data *sd, clr_type clrtype) { unit->remove_map(&sd->bl,clrtype,ALC_MARK); - - if (clrtype == CLR_TELEPORT) clrtype = CLR_OUTSIGHT; //CLR_TELEPORT is the warp from logging out, but pets/homunc need to just 'vanish' instead of showing the warping out animation. - + + //CLR_RESPAWN is the warp from logging out, CLR_TELEPORT is the warp from teleporting, but pets/homunc need to just 'vanish' instead of showing the warping animation. + if (clrtype == CLR_RESPAWN || clrtype == CLR_TELEPORT) clrtype = CLR_OUTSIGHT; + if(sd->pd) unit->remove_map(&sd->pd->bl, clrtype, ALC_MARK); if(homun_alive(sd->hd)) -- cgit v1.2.3-60-g2f50