diff options
| author | shennetsind <shennetsind@users.noreply.github.com> | 2014-02-26 13:19:50 -0300 |
|---|---|---|
| committer | shennetsind <shennetsind@users.noreply.github.com> | 2014-02-26 13:19:50 -0300 |
| commit | 3f473c2800f8637a6f6ce245b93ac51475e69989 (patch) | |
| tree | 0ce7c3a5119beccb2c30accc869e5335d2b96614 /src/map | |
| parent | 142a8f463120274fd9915a8a3a604d27ce42c43d (diff) | |
| parent | fb82304b2e359cc90924f28522f79e82204fffdf (diff) | |
| download | hercules-3f473c2800f8637a6f6ce245b93ac51475e69989.tar.gz hercules-3f473c2800f8637a6f6ce245b93ac51475e69989.tar.bz2 hercules-3f473c2800f8637a6f6ce245b93ac51475e69989.tar.xz hercules-3f473c2800f8637a6f6ce245b93ac51475e69989.zip | |
Merge pull request #259 from cannelle/master
Animation fixes.
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/unit.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 425759d29..a3541cab9 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10291,7 +10291,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] */ diff --git a/src/map/unit.c b/src/map/unit.c index 96d2c7775..47cf07ef6 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -2288,9 +2288,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)) |