X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_weapons.qc;h=7b0bbce3c8ff83ab2b4314ab087b252f5a10b30f;hb=afe516adadb6bd8bc62a333b29064db24c73c6b5;hp=9ccc48c9c9ff25a2eea1457b685d04c8a3083fc7;hpb=5a82a6e74c293b005d585e9fdbdb57b0e49f16d1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 9ccc48c9c..7b0bbce3c 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -1,4 +1,4 @@
-void W_DoReload()
+void W_TriggerReload()
 {
     weapon_action(self.weapon, WR_RELOAD);
 }
@@ -15,7 +15,7 @@ void W_SwitchWeapon(float imp)
 	}
 	else
 	{
-		W_DoReload();
+		W_TriggerReload();
 	}
 };
 
@@ -221,6 +221,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);