From 3b580431e8bd0adec1c8fa87abbc2e3c75f3faca Mon Sep 17 00:00:00 2001
From: shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 25 Dec 2011 11:13:27 +0000
Subject: Follow up r15267, changed to standard

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15268 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/battle.c | 2 --
 src/map/clif.c   | 2 --
 src/map/pc.c     | 5 -----
 src/map/status.c | 3 ++-
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/map/battle.c b/src/map/battle.c
index 682020c23..aa494c3e4 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1240,8 +1240,6 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo
 			cri+= sd->critaddrace[tstatus->race];
 			if(flag.arrow)
 				cri += sd->arrow_cri;
-			if(sd->status.weapon == W_KATAR)
-				cri <<=1;
 		}
 		//The official equation is *2, but that only applies when sd's do critical.
 		//Therefore, we use the old value 3 on cases when an sd gets attacked by a mob
diff --git a/src/map/clif.c b/src/map/clif.c
index ac5ee91e3..a8969d38e 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2587,8 +2587,6 @@ int clif_updatestatus(struct map_session_data *sd,int type)
 		break;
 	case SP_CRITICAL:
 		WFIFOL(fd,4)=sd->battle_status.cri/10;
-		if(sd->status.weapon == W_KATAR)
-			WFIFOL(fd,4) <<=1;
 		break;
 	case SP_MATK1:
 		WFIFOL(fd,4)=sd->battle_status.matk_max;
diff --git a/src/map/pc.c b/src/map/pc.c
index 0c286f29e..1110aba09 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -7354,8 +7354,6 @@ int pc_equipitem(struct map_session_data *sd,int n,int req_pos)
 			sd->weapontype1 = 0;
 		pc_calcweapontype(sd);
 		clif_changelook(&sd->bl,LOOK_WEAPON,sd->status.weapon);
-		if( sd->status.weapon == W_KATAR )
-			clif_updatestatus(sd,SP_CRITICAL);
 	}
 	if(pos & EQP_HAND_L) {
 		if(id) {
@@ -7497,12 +7495,9 @@ int pc_unequipitem(struct map_session_data *sd,int n,int flag)
 		clif_changelook(&sd->bl,LOOK_WEAPON,sd->status.weapon);
 	}
 	if(sd->status.inventory[n].equip & EQP_HAND_L) {
-		bool kt_flag = ( sd->status.weapon == W_KATAR );
 		sd->status.shield = sd->weapontype2 = 0;
 		pc_calcweapontype(sd);
 		clif_changelook(&sd->bl,LOOK_SHIELD,sd->status.shield);
-		if( kt_flag )
-			clif_updatestatus(sd,SP_CRITICAL);
 	}
 	if(sd->status.inventory[n].equip & EQP_HEAD_LOW && pc_checkequip(sd,EQP_COSTUME_HEAD_LOW) == -1 ) {
 		sd->status.head_bottom = 0;
diff --git a/src/map/status.c b/src/map/status.c
index 738a62c45..7662d2770 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3926,7 +3926,8 @@ static signed short status_calc_critical(struct block_list *bl, struct status_ch
 		critical += critical;
 	if(sc->data[SC_CAMOUFLAGE])
 		critical += 100;
-
+	if( bl->type == BL_PC && ((TBL_PC*)bl)->status.weapon == W_KATAR )
+		critical <<= 1;
 	return (short)cap_value(critical,10,SHRT_MAX);
 }
 
-- 
cgit v1.2.3-70-g09d2