summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-15 14:00:27 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-15 14:00:27 +0000
commit00be89f64050ff5373a63cc599f533f57ffaead1 (patch)
treed6ffded38d53e36cf5075a62242c8a03b21e13b0 /src/map/pc.c
parent2503f4ca66cfd8c7014d099883ca696082c27a39 (diff)
downloadhercules-00be89f64050ff5373a63cc599f533f57ffaead1.tar.gz
hercules-00be89f64050ff5373a63cc599f533f57ffaead1.tar.bz2
hercules-00be89f64050ff5373a63cc599f533f57ffaead1.tar.xz
hercules-00be89f64050ff5373a63cc599f533f57ffaead1.zip
Improving the r13888 crashfix to cover similar crash scenarios discovered:
Reordered code in status_change_end(SC_DANCING) so that an ensemble's skill unit group is deleted only after removing both performers' status changes. Modified the call to skill_delunitgroup() IN status_change_end(SC_DANCING) so that it always processes the group's true owner and not others (bugreport:3253). Replaced calls to skill_stop_dancing() with status_change_end(SC_DANCING), since it now provides identical functionality. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13891 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index a53a3a7fe..21173b673 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6916,7 +6916,7 @@ int pc_unequipitem(struct map_session_data *sd,int n,int flag)
pc_calcweapontype(sd);
clif_changelook(&sd->bl,LOOK_WEAPON,sd->status.weapon);
if(sd->sc.data[SC_DANCING]) //When unequipping, stop dancing. [Skotlex]
- skill_stop_dancing(&sd->bl);
+ status_change_end(&sd->bl, SC_DANCING, -1);
}
if(sd->status.inventory[n].equip & EQP_HAND_L) {
sd->status.shield = sd->weapontype2 = 0;