From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 1 Mar 2011 22:47:42 +0000 (+0200)
Subject: Enable having to reload your weapon after dropping it by getting swallowed. This... 
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=9c36d00758f9a4c997b9fd970fc682e0bed90efd;ds=sidebyside

Enable having to reload your weapon after dropping it by getting swallowed. This should have already been happening, and was part of something bigger that I missed.
---

diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index 92f0dca6..6aaffd28 100644
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -357,9 +357,9 @@ void player_anim (void)
 		setanim(self.weaponentity, self.weaponentity.anim_idle, TRUE, FALSE, FALSE);
 }
 
-void SpawnThrownWeapon (vector org, float w)
+void SpawnThrownWeapon (vector org, float w, float doreduce)
 {
-	W_ThrowWeapon(randomvec() * 125 + '0 0 200', org - self.origin, FALSE);
+	W_ThrowWeapon(randomvec() * 125 + '0 0 200', org - self.origin, doreduce);
 }
 
 void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
@@ -593,7 +593,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
 		// clear selected player display
 		ClearSelectedPlayer();
 		// throw a weapon
-		SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);
+		SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon, FALSE);
 		// print an obituary message
 		Obituary (attacker, inflictor, self, deathtype);
 		race_PreDie();
@@ -758,7 +758,7 @@ void UpdateSelectedPlayer()
 		if(!self.dropweapon_check)
 		if(self.predator.team != self.team) // don't disarm team mates when swallowing them
 		if(random() < cvar("g_balance_vore_swallow_dropweapon"))
-			SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon);
+			SpawnThrownWeapon (self.origin + (self.mins + self.maxs) * 0.5, self.switchweapon, TRUE);
 		self.dropweapon_check = TRUE;
 	}
 	else