Browse Source

* Fixed switching between musical weapons would cancel ongoing dance skills (bugreport:4756, since r3538).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14790 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 14 years ago
parent
commit
b3ec545cee
2 changed files with 2 additions and 1 deletions
  1. 1 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/pc.c

+ 1 - 0
Changelog-Trunk.txt

@@ -1,6 +1,7 @@
 Date	Added
 Date	Added
 
 
 2011/04/10
 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]
 	* Fixed @changegm not updating guild window interface after changing the guild leader (bugreport:408, since r2622, related r3185). [Ai4rei]
 2011/04/09
 2011/04/09
 	* Moved duel code into a separate file. [Ai4rei]
 	* Moved duel code into a separate file. [Ai4rei]

+ 1 - 1
src/map/pc.c

@@ -4367,6 +4367,7 @@ int pc_checkallowskill(struct map_session_data *sd)
 		SC_SPEARQUICKEN,
 		SC_SPEARQUICKEN,
 		SC_ADRENALINE,
 		SC_ADRENALINE,
 		SC_ADRENALINE2,
 		SC_ADRENALINE2,
+		SC_DANCING,
 		SC_GATLINGFEVER
 		SC_GATLINGFEVER
 	};
 	};
 	const enum sc_type scs_list[] = {
 	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;
 		sd->status.weapon = sd->weapontype2;
 		pc_calcweapontype(sd);
 		pc_calcweapontype(sd);
 		clif_changelook(&sd->bl,LOOK_WEAPON,sd->status.weapon);
 		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) {
 	if(sd->status.inventory[n].equip & EQP_HAND_L) {
 		sd->status.shield = sd->weapontype2 = 0;
 		sd->status.shield = sd->weapontype2 = 0;