X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weapons.qc;h=4a333934ae84a5ddc83f4281e2f7406daff1ef9a;hb=e5cec7ef408853cad605faadb3a1ee0a4b5a5a9d;hp=658fe54d32901b2b689df87a6424ad47c05d9288;hpb=9f263d1ca58988c35dec42ee992297c3f8fcfcd2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 658fe54d3..4a333934a 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -137,6 +137,15 @@ 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);
@@ -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
 					}
 				}
 			}
@@ -330,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;
@@ -346,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);
@@ -355,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
@@ -366,8 +379,16 @@ 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)
 			{
@@ -400,7 +421,8 @@ void W_WeaponFrame()
 		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;
 		}