From 797848cc6647ae1dd682fae3749b7adf80a5fa21 Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 20 Dec 2006 00:44:52 +0000 Subject: - Fixed SC_STRIPWEAPON failing on two-handed weapons. - Minor changes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9529 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/status.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/map/status.c') diff --git a/src/map/status.c b/src/map/status.c index aee10e721..dab6861ea 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4931,18 +4931,25 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val case SC_STRIPWEAPON: if (sd) { int i; + opt_flag = 0; //Reuse to check success condition. if(sd->unstripable_equip&EQP_WEAPON) return 0; i = sd->equip_index[EQI_HAND_L]; if (i>=0 && sd->inventory_data[i] && sd->inventory_data[i]->type == IT_WEAPON) + { + opt_flag|=1; pc_unequipitem(sd,i,3); //L-hand weapon + } i = sd->equip_index[EQI_HAND_R]; - if (i<0 || !sd->inventory_data[i] || - sd->inventory_data[i]->type != IT_WEAPON) - return 0; - pc_unequipitem(sd,i,3); + if (i>=0 && sd->inventory_data[i] && + sd->inventory_data[i]->type == IT_WEAPON) + { + opt_flag|=2; + pc_unequipitem(sd,i,3); + } + if (!opt_flag) return 0; } else //Watk reduction val2 = 5*val1; break; -- cgit v1.2.3-60-g2f50