diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-04-10 14:31:27 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-04-10 14:31:27 +0000 |
| commit | ded99f09f476929b836bf76297624d88ed072bef (patch) | |
| tree | afe39beb909bebd31eaf79c941598ad25272ebfc | |
| parent | 1d680607095ad13d68db10ea6ae31740164baded (diff) | |
| download | hercules-ded99f09f476929b836bf76297624d88ed072bef.tar.gz hercules-ded99f09f476929b836bf76297624d88ed072bef.tar.bz2 hercules-ded99f09f476929b836bf76297624d88ed072bef.tar.xz hercules-ded99f09f476929b836bf76297624d88ed072bef.zip | |
* Fixed switching between musical weapons would cancel ongoing dance skills (bugreport:4756, since r3538).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14790 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index cef1a50cc..f4aaf32ca 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2011/04/10 + * Fixed switching between musical weapons would cancel ongoing dance skills (bugreport:4756, since r3538). [Ai4rei] * Fixed @changegm not updating guild window interface after changing the guild leader (bugreport:408, since r2622, related r3185). [Ai4rei] 2011/04/09 * Moved duel code into a separate file. [Ai4rei] diff --git a/src/map/pc.c b/src/map/pc.c index fad6a2261..a63bd4d87 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4367,6 +4367,7 @@ int pc_checkallowskill(struct map_session_data *sd) SC_SPEARQUICKEN, SC_ADRENALINE, SC_ADRENALINE2, + SC_DANCING, SC_GATLINGFEVER }; const enum sc_type scs_list[] = { @@ -7253,7 +7254,6 @@ int pc_unequipitem(struct map_session_data *sd,int n,int flag) sd->status.weapon = sd->weapontype2; pc_calcweapontype(sd); clif_changelook(&sd->bl,LOOK_WEAPON,sd->status.weapon); - status_change_end(&sd->bl, SC_DANCING, INVALID_TIMER); //When unequipping, stop dancing. [Skotlex] } if(sd->status.inventory[n].equip & EQP_HAND_L) { sd->status.shield = sd->weapontype2 = 0; |