X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weapons.qc;h=0014e9182d4f4c864559af9f5982902dbc37efcb;hb=2bb2db9c0f8016645a23381d7493588d748ecacf;hp=a131576a86edd067d7c78e85c4c5863f58fd0eeb;hpb=d15f34b027d08e43713c98d2a27756df27164c34;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index a131576a8..0014e9182 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -158,16 +158,6 @@ float weapon_action(float wpn, float wrequest)
 	return (get_weaponinfo(wpn)).weapon_func(wrequest);
 }
 
-string W_Name(float weaponid)
-{
-	return (get_weaponinfo(weaponid)).message;
-}
-
-float W_AmmoItemCode(float wpn)
-{
-	return (get_weaponinfo(wpn)).items & IT_AMMO;
-}
-
 .float savenextthink;
 void thrown_wep_think()
 {
@@ -298,6 +288,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 		wep.savenextthink = wep.nextthink;
 		wep.nextthink = min(wep.nextthink, time + 0.5);
 		wep.pickup_anyway = TRUE; // these are ALWAYS pickable
+
 		return s;
 	}
 }
@@ -310,8 +301,6 @@ float W_IsWeaponThrowable(float w)
 		return 0;
 	if (g_weaponarena)
 		return 0;
-	if (g_lms)
-		return 0;
 	if (g_cts)
 		return 0;
 	if (g_nexball && w == WEP_GRENADE_LAUNCHER)
@@ -356,15 +345,24 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
 
 	W_SwitchWeapon_Force(self, w_getbestweapon(self));
 	a = W_ThrowNewWeapon(self, w, doreduce, self.origin + delta, velo);
-	if not(a)
-		return;
-	if(a == "")
-		sprint(self, strcat("You dropped the ^2", W_Name(w), "\n"));
-	else
-		sprint(self, strcat("You dropped the ^2", W_Name(w), " with ", a, "\n"));
+	
+	if not(a) return;
+	Send_Notification(NOTIF_ONE, self, MSG_MULTI, ITEM_WEAPON_DROP, a, w);
+}
+
+float forbidWeaponUse()
+{
+	if(time < game_starttime && !autocvar_sv_ready_restart_after_countdown)
+		return 1;
+	if(round_handler_IsActive() && !round_handler_IsRoundStarted())
+		return 1;
+	if(self.player_blocked)
+		return 1;
+	if(self.freezetag_frozen)
+		return 1;
+	return 0;
 }
 
-// Bringed back weapon frame
 void W_WeaponFrame()
 {
 	vector fo, ri, up;
@@ -372,21 +370,16 @@ void W_WeaponFrame()
 	if (frametime)
 		self.weapon_frametime = frametime;
 
-	if(time < game_starttime && !autocvar_sv_ready_restart_after_countdown)
-		return;
-
-	if(round_handler_IsActive() && !round_handler_IsRoundStarted())
-		return;
-
-	if(self.player_blocked)
-		return;
-
-	if(self.freezetag_frozen == 1)
-		return;
-
 	if (!self.weaponentity || self.health < 1)
 		return; // Dead player can't use weapons and injure impulse commands
 
+	if(forbidWeaponUse())
+	if(self.weaponentity.state != WS_CLEAR)
+	{
+		w_ready();
+		return;
+	}
+
 	if(!self.switchweapon)
 	{
 		self.weapon = 0;