X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_weapons.qc;h=020a55cfb098f0af8682c6c6f893e10203ae724e;hb=fa0b0f7444376458bdf83e261bc65b03c2ef03b4;hp=0cd918caae428cef85f8c7320833753e3d5bd0cd;hpb=ddaf6ba92d6541ab9210533a0d2c66cdcdec8e3c;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc
index 0cd918ca..020a55cf 100644
--- a/data/qcsrc/server/cl_weapons.qc
+++ b/data/qcsrc/server/cl_weapons.qc
@@ -1,3 +1,8 @@
+void W_TriggerReload()
+{
+    weapon_action(self.weapon, WR_RELOAD);
+}
+
 // switch between weapons
 void W_SwitchWeapon(float imp)
 {
@@ -6,6 +11,10 @@ void W_SwitchWeapon(float imp)
 		if (client_hasweapon(self, imp, TRUE, TRUE))
 			W_SwitchWeapon_Force(self, imp);
 	}
+	else
+	{
+		W_TriggerReload();
+	}
 };
 
 .float weaponcomplainindex;
@@ -217,6 +226,13 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 					wep.ammofield = thisammo;
 					own.ammofield -= thisammo;
 					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)
+					{
+						own.ammofield += self.weapon_load[self.weapon];
+						self.weapon_load[self.weapon] = -1; // schedule the weapon for reloading
+					}
 				}
 			}
 			s = substring(s, 5, -1);
@@ -323,6 +339,18 @@ void W_WeaponFrame()
 			setanim(self, self.anim_draw, FALSE, TRUE, TRUE);
 			self.weaponentity.state = WS_RAISE;
 			weapon_action(self.switchweapon, WR_SETUP);
+
+			// set our clip load to the load of the weapon we switched to, if it's reloadable
+			entity e;
+			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_size = cvar(strcat("g_balance_", e.netname, "_reload_ammo"));
+			}
+			else
+				self.clip_load = self.clip_size = 0;
+
 			// VorteX: add player model weapon select frame here
 			// setcustomframe(PlayerWeaponRaise);
 			weapon_thinkf(WFRAME_IDLE, cvar("g_balance_weaponswitchdelay"), w_ready);