From 591bf7cf6244db282437577f96e006653b4c60a5 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 13 Dec 2013 12:06:04 +1100 Subject: [PATCH] Retrieve weapon name from client, rather than networking it --- qcsrc/client/Main.qc | 2 +- qcsrc/server/weapons/selection.qc | 9 ++++----- qcsrc/server/weapons/selection.qh | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index bab39d400..b719fd924 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -1166,7 +1166,7 @@ void Net_WeaponComplain() if(complain_weapon_name) strunzone(complain_weapon_name); - complain_weapon_name = strzone(ReadString()); + complain_weapon_name = strzone(W_Name(complain_weapon)); complain_weapon_type = ReadByte(); diff --git a/qcsrc/server/weapons/selection.qc b/qcsrc/server/weapons/selection.qc index d26ed831f..cb4159f13 100644 --- a/qcsrc/server/weapons/selection.qc +++ b/qcsrc/server/weapons/selection.qc @@ -1,11 +1,10 @@ // switch between weapons -void Send_WeaponComplain(entity e, float wpn, string wpnname, float type) +void Send_WeaponComplain(entity e, float wpn, float type) { msg_entity = e; WriteByte(MSG_ONE, SVC_TEMPENTITY); WriteByte(MSG_ONE, TE_CSQC_WEAPONCOMPLAIN); WriteByte(MSG_ONE, wpn); - WriteString(MSG_ONE, wpnname); WriteByte(MSG_ONE, type); } @@ -58,7 +57,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) if(IS_REAL_CLIENT(cl)) { play2(cl, "weapons/unavailable.wav"); - Send_WeaponComplain (cl, wpn, W_Name(wpn), 0); + Send_WeaponComplain (cl, wpn, 0); } return FALSE; } @@ -71,7 +70,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) // Report Proper Weapon Status / Modified Weapon Ownership Message if (weaponsInMap & WepSet_FromWeapon(wpn)) { - Send_WeaponComplain(cl, wpn, W_Name(wpn), 1); + Send_WeaponComplain(cl, wpn, 1); if(autocvar_g_showweaponspawns) { @@ -101,7 +100,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain) } else { - Send_WeaponComplain (cl, wpn, W_Name(wpn), 2); + Send_WeaponComplain (cl, wpn, 2); } play2(cl, "weapons/unavailable.wav"); diff --git a/qcsrc/server/weapons/selection.qh b/qcsrc/server/weapons/selection.qh index 17310eb81..8e2937f0c 100644 --- a/qcsrc/server/weapons/selection.qh +++ b/qcsrc/server/weapons/selection.qh @@ -1,5 +1,5 @@ // switch between weapons -void Send_WeaponComplain(entity e, float wpn, string wpnname, float type); +void Send_WeaponComplain(entity e, float wpn, float type); .float hasweapon_complain_spam; float client_hasweapon(entity cl, float wpn, float andammo, float complain); -- 2.39.2