X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weapons.qc;h=edf5b1f5e5c697d07087509075ef53edc2af5bd0;hb=a4507f589e7a11838a63576e69b5789cb97d6815;hp=cab6ec6e75c5adcb56a8d7b07b417875a2a251c6;hpb=8ad8bf067e165c2953462c45aea4ff2127967ee2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index cab6ec6e7..edf5b1f5e 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)
 {
@@ -224,10 +233,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
 					}
 				}
 			}
@@ -278,14 +287,12 @@ 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;
 	if (w == 0)
 		return; // just in case
-	if(self.weapon_forbidchange)
-		return;
 	if(MUTATOR_CALLHOOK(ForbidThrowCurrentWeapon))
 		return;
 	if(!autocvar_g_weapon_throwable)
@@ -310,7 +317,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()
@@ -332,6 +339,7 @@ void W_WeaponFrame()
 	if(!self.switchweapon)
 	{
 		self.weapon = 0;
+		self.switchingweapon = 0;
 		self.weaponentity.state = WS_CLEAR;
 		self.weaponname = "";
 		self.items &~= IT_AMMO;
@@ -348,6 +356,9 @@ void W_WeaponFrame()
 	{
 		if (self.weaponentity.state == WS_CLEAR)
 		{
+			// end switching!
+			self.switchingweapon = self.switchweapon;
+
 			//setanim(self, self.anim_draw, FALSE, TRUE, TRUE);
 			self.weaponentity.state = WS_RAISE;
 			weapon_action(self.switchweapon, WR_SETUP);
@@ -357,7 +368,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
@@ -368,14 +379,21 @@ void W_WeaponFrame()
 			weapon_thinkf(WFRAME_IDLE, autocvar_g_balance_weaponswitchdelay, w_ready);
 			weapon_boblayer1(PLAYER_WEAPONSELECTION_SPEED, '0 0 0');
 		}
+		else if (self.weaponentity.state == WS_DROP)
+		{
+			// in dropping phase we can switch at any time
+			self.switchingweapon = self.switchweapon;
+		}
 		else if (self.weaponentity.state == WS_READY)
 		{
+			// start switching!
+			self.switchingweapon = self.switchweapon;
+
 #ifndef INDEPENDENT_ATTACK_FINISHED
 			if(ATTACK_FINISHED(self) <= time + self.weapon_frametime * 0.5)
 			{
 #endif
-			// UGLY WORKAROUND: play this on CHAN_WEAPON2 so it can't cut off fire sounds
-			sound (self, CHAN_WEAPON2, "weapons/weapon_switch.wav", VOL_BASE, ATTN_NORM);
+			sound (self, CH_WEAPON_SINGLE, "weapons/weapon_switch.wav", VOL_BASE, ATTN_NORM);
 			self.weaponentity.state = WS_DROP;
 			// set up weapon switch think in the future, and start drop anim
 			weapon_thinkf(WFRAME_DONTCHANGE, autocvar_g_balance_weaponswitchdelay, w_clear);
@@ -396,23 +414,27 @@ 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;
 		}
+
+		v_forward = fo;
+		v_right = ri;
+		v_up = up;
+
 		if(wb)
-		{
-			v_forward = fo;
-			v_right = ri;
-			v_up = up;
 			weapon_action(self.weapon, WR_THINK);
-		}
+		else
+			weapon_action(self.weapon, WR_GONETHINK);
+
 		if (time + self.weapon_frametime * 0.5 >= self.weapon_nextthink)
 		{
 			if(self.weapon_think)
@@ -447,4 +469,4 @@ void W_WeaponFrame()
 	else
 		self.currentammo = 1;
 #endif
-};
+}