Bard/Dancer re-equip weapon while in dancing state

Originally posted by [b]Memiko[/b]
http://www.eathena.ws/board/index.php?autocom=bugtracker&showbug=4756

[b][color="#FF0000"]Different between eAthena and aegis.[/color][/b]

[b][color="#FF0000"]Same at this tropic: [url="http://www.eathena.ws/board/index.php?showtopic=265558&st=0#entry1453436"]http://www.eathena.ws/board/index.php?show...=0#entry1453436[/url][/color][/b]

[color="#9932CC"][b]Screenshot from TRO official.[/b][/color]

[url="http://img708.imageshack.us/i/barddancer.jpg/"][img]http://img708.imageshack.us/img708/6842/barddancer.jpg[/img][/url]

[color="#9932CC"][b]Here is bug of eAthena about Bard/Dancer re-equip weapons while dancing state.

eAthena version

in pc.c (int pc_unequipitem(struct map_session_data *sd,int n,int flag))[/b][/color]

[code] if(sd->status.inventory[n].equip & EQP_HAND_R) {
sd->weapontype1 = 0;
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]******************
}[/code]

[color="#9932CC"][b]that mean when you try to un-equip any weapons while in dancing state, you will stop from dancing/singing state.

I test it in eAthena...

1. un-equip weapon while in dancing/singing state >>>> stop from dancing/singing state.

2. change the weapon into whip/musical, dagger or bow while in dancing/singing state >>>> stop from dancing/singing state.

Aegis Version

Dancing/singing state will stop only if........

1. un-equip weapon while in dancing/singing state.

2. change the weapon into dagger or bow only! while in dancing/singing state.

That i mean in Aegis official, If you swift weapon to any whip/musical while in dancing/singing state you will not stop from dancing/singing and again to continue dancing/singing and state.

I think we need to edit in pc.c at this

int pc_unequipitem(struct map_session_data *sd,int n,int flag) same at top codebox.

and

int pc_equipitem(struct map_session_data *sd,int n,int req_pos)[/b][/color]

[code] if(pos & EQP_HAND_R) {
if(id)
sd->weapontype1 = id->look;
else
sd->weapontype1 = 0;
pc_calcweapontype(sd);
clif_changelook(&sd->bl,LOOK_WEAPON,sd->status.weapon);
}[/code]

[color="#9932CC"][b]P.s. Thank in advance.[/b][/color]