summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-18 03:35:00 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-18 03:35:00 +0000
commit3238a7ff626d448d6291e33e94e473c728d0d0b7 (patch)
treefac01ea35e1b00fa69d14405b5a80831aa103064 /src/map/clif.c
parentaefef10ae8e198660785b9dbaa267751274ba672 (diff)
downloadhercules-3238a7ff626d448d6291e33e94e473c728d0d0b7.tar.gz
hercules-3238a7ff626d448d6291e33e94e473c728d0d0b7.tar.bz2
hercules-3238a7ff626d448d6291e33e94e473c728d0d0b7.tar.xz
hercules-3238a7ff626d448d6291e33e94e473c728d0d0b7.zip
Added Official behavior to non-ensamble songs: they no longer go off if you warp within the same map. bugreport:4547
Dev Note: I didn't put it under session data cause only bard/gypsy classes use it, I found it to a be a waste. I'm not very comfortable with the dbmap either, however, so if you got any idea on how to make it more efficient lets talk :3 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15708 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 6196d347d..279f58d5e 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8947,6 +8947,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
clif_changemap(sd, sd->mapindex, sd->bl.x, sd->bl.y);
return;
}
+
+ sd->state.warping = 0;
// look
#if PACKETVER < 4
@@ -9216,9 +9218,11 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
// If player is dead, and is spawned (such as @refresh) send death packet. [Valaris]
if(pc_isdead(sd))
clif_clearunit_area(&sd->bl, CLR_DEAD);
+ else {
+ skill_usave_trigger(sd);
// Uncomment if you want to make player face in the same direction he was facing right before warping. [Skotlex]
-// else
// clif_changed_dir(&sd->bl, SELF);
+ }
// Trigger skill effects if you appear standing on them
if(!battle_config.pc_invincible_time)