X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weapons.qc;h=b1f6aabba106d9728c27f967dab608f6a365a0ad;hb=7be962b4cc8c6d7e9f30f150070eaf187e98ecd3;hp=afe3088d431cd40507f61ce543442da20f80fa8c;hpb=db3d8b68f0aff3f1304428e9d60836b4a8013a5a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index afe3088d4..b1f6aabba 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -17,7 +17,7 @@ void W_SwitchWeapon(float imp)
 	{
 		W_TriggerReload();
 	}
-};
+}
 
 .float weaponcomplainindex;
 float W_GetCycleWeapon(entity pl, string weaponorder, float dir, float imp, float complain, float skipmissing)
@@ -137,17 +137,26 @@ void W_PreviousWeapon(float list)
 		W_CycleWeapon(self.cvar_cl_weaponpriority, +1);
 }
 
+// previously used if exists and has ammo, (second) best otherwise
+void W_LastWeapon()
+{
+	if(client_hasweapon(self, self.cnt, TRUE, FALSE))
+		W_SwitchWeapon(self.cnt);
+	else
+		W_SwitchToOtherWeapon(self);
+}
+
 float w_getbestweapon(entity e)
 {
 	return W_GetCycleWeapon(e, e.cvar_cl_weaponpriority, 0, -1, FALSE, TRUE);
-};
+}
 
 // generic weapons table
 // TODO should they be macros instead?
 float weapon_action(float wpn, float wrequest)
 {
 	return (get_weaponinfo(wpn)).weapon_func(wrequest);
-};
+}
 
 string W_Name(float weaponid)
 {
@@ -211,7 +220,25 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 		self = oldself;
 		if(startitem_failed)
 			return string_null;
-		if(doreduce)
+		if(doreduce && g_weapon_stay == 2)
+		{
+			for(i = 0, j = 1; i < 24; ++i, j *= 2)
+			{
+				if(wa & j)
+				{
+					ammofield = Item_CounterField(j);
+					wep.ammofield = 0;
+
+					// if our weapon is loaded, give its load back to the player
+					if(self.(weapon_load[self.weapon]) > 0)
+					{
+						own.ammofield += self.(weapon_load[self.weapon]);
+						self.(weapon_load[self.weapon]) = -1; // schedule the weapon for reloading
+					}
+				}
+			}
+		}
+		else if(doreduce)
 		{
 			for(i = 0, j = 1; i < 24; ++i, j *= 2)
 			{
@@ -224,10 +251,10 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 					s = strcat(s, " and ", ftos(thisammo), " ", Item_CounterFieldName(j));
 
 					// if our weapon is loaded, give its load back to the player
-					if(self.weapon_load[self.weapon] > 0)
+					if(self.(weapon_load[self.weapon]) > 0)
 					{
-						own.ammofield += self.weapon_load[self.weapon];
-						self.weapon_load[self.weapon] = -1; // schedule the weapon for reloading
+						own.ammofield += self.(weapon_load[self.weapon]);
+						self.(weapon_load[self.weapon]) = -1; // schedule the weapon for reloading
 					}
 				}
 			}
@@ -236,6 +263,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 		wep.glowmod = own.weaponentity_glowmod;
 		wep.think = thrown_wep_think;
 		wep.nextthink = time + 0.5;
+		wep.pickup_anyway = TRUE; // these are ALWAYS pickable
 		return s;
 	}
 }
@@ -278,7 +306,7 @@ float W_IsWeaponThrowable(float w)
 // toss current weapon
 void W_ThrowWeapon(vector velo, vector delta, float doreduce)
 {
-	local float w, wb;
+	float w, wb;
 	string a;
 
 	w = self.weapon;
@@ -288,8 +316,6 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
 		return;
 	if(!autocvar_g_weapon_throwable)
 		return;
-	if(autocvar_g_weapon_stay == 1)
-		return;
 	if(self.weaponentity.state != WS_READY)
 		return;
 	if(!W_IsWeaponThrowable(w))
@@ -308,7 +334,7 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
 		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"));
-};
+}
 
 // Bringed back weapon frame
 void W_WeaponFrame()
@@ -359,7 +385,7 @@ void W_WeaponFrame()
 			e = get_weaponinfo(self.switchweapon);
 			if(e.spawnflags & WEP_FLAG_RELOADABLE && cvar(strcat("g_balance_", e.netname, "_reload_ammo"))) // prevent accessing undefined cvars
 			{
-				self.clip_load = self.weapon_load[self.switchweapon];
+				self.clip_load = self.(weapon_load[self.switchweapon]);
 				self.clip_size = cvar(strcat("g_balance_", e.netname, "_reload_ammo"));
 			}
 			else
@@ -405,14 +431,15 @@ void W_WeaponFrame()
 	// call the think code which may fire the weapon
 	// and do so multiple times to resolve framerate dependency issues if the
 	// server framerate is very low and the weapon fire rate very high
-	local float c;
+	float c;
 	c = 0;
 	while (c < W_TICSPERFRAME)
 	{
 		c = c + 1;
 		if(wb && ((self.weapons & wb) == 0))
 		{
-			W_SwitchWeapon_Force(self, w_getbestweapon(self));
+			if(self.weapon == self.switchweapon)
+				W_SwitchWeapon_Force(self, w_getbestweapon(self));
 			wb = 0;
 		}
 
@@ -459,4 +486,4 @@ void W_WeaponFrame()
 	else
 		self.currentammo = 1;
 #endif
-};
+}