summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-04 15:18:30 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-04 15:18:30 +0000
commita8ed5bce482007aa96ff5f6674d6dfe6bbfaa487 (patch)
tree0fc125a761a7db8a4d8c7de02fb2fcb2f3c14c6d /src/map/pc.c
parent07e900f02b198bbfec480fceefb4a492f5ca8911 (diff)
downloadhercules-a8ed5bce482007aa96ff5f6674d6dfe6bbfaa487.tar.gz
hercules-a8ed5bce482007aa96ff5f6674d6dfe6bbfaa487.tar.bz2
hercules-a8ed5bce482007aa96ff5f6674d6dfe6bbfaa487.tar.xz
hercules-a8ed5bce482007aa96ff5f6674d6dfe6bbfaa487.zip
- Stun time for using ES magic on non-mobs reduced to 0.5 secs.
- Eska is now usable on bosses. - Swoo will stun you if attempted on an already 'swooned' enemy. - clif_skill_failed will print out a debug line with the skill_id (since the current null_po does not helps at all to fix it) - Applied TheUltraMage's suggested fixes to the grfio module. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6467 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 47efd18c0..d2d73acb5 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6255,13 +6255,17 @@ int pc_unequipitem(struct map_session_data *sd,int n,int flag)
clif_changelook(&sd->bl,LOOK_SHOES,0);
clif_unequipitemack(sd,n,sd->status.inventory[n].equip,1);
+
+ if((sd->status.inventory[n].equip&0x0022) &&
+ sd->weapontype1 == 0 && sd->weapontype2 == 0)
+ skill_enchant_elemental_end(&sd->bl,-1);
+
sd->status.inventory[n].equip=0;
- if(flag&1)
+
+ if(flag&1) {
pc_checkallowskill(sd);
- if(sd->weapontype1 == 0 && sd->weapontype2 == 0)
- skill_enchant_elemental_end(&sd->bl,-1); //武器持ち誓えは無?件で?性付?解除
- if(flag&1)
status_calc_pc(sd,0);
+ }
if(sd->sc.count && sd->sc.data[SC_SIGNUMCRUCIS].timer != -1 && !battle_check_undead(RC_DEMIHUMAN,sd->def_ele))
status_change_end(&sd->bl,SC_SIGNUMCRUCIS,-1);