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-70-g09d2 From fb82304b2e359cc90924f28522f79e82204fffdf Mon Sep 17 00:00:00 2001 From: cannelle Date: Thu, 20 Feb 2014 14:30:37 -0600 Subject: Fixed animation for dead players respawning. CLR_RESPAWN is actually the logout animation not the respawn animation. CLR_OUTSIGHT is the correct animation for respawning. --- src/map/clif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/map/clif.c b/src/map/clif.c index 357c4dc6a..9b2f76c0e 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10328,7 +10328,7 @@ void clif_parse_ActionRequest(int fd, struct map_session_data *sd) void clif_parse_Restart(int fd, struct map_session_data *sd) { switch(RFIFOB(fd,2)) { case 0x00: - pc->respawn(sd,CLR_RESPAWN); + pc->respawn(sd,CLR_OUTSIGHT); break; case 0x01: /* Rovert's Prevent logout option - Fixed [Valaris] */ -- cgit v1.2.3-70-g09d2