From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 20 Dec 2010 20:48:24 +0000 (+0100)
Subject: random weapon arena: fix issue with laser
X-Git-Tag: xonotic-v0.1.0preview~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd3251bb6a286b069e22f44c0836079ec335a2d8;p=xonotic%2Fxonotic-data.pk3dir.git

random weapon arena: fix issue with laser
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 6ab29006d..2a12ef520 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -102,7 +102,7 @@ void UpdateFrags(entity player, float f)
 
 // NOTE: f=0 means still count as a (positive) kill, but count no frags for it
 void W_SwitchWeapon_Force(entity e, float w);
-void GiveFrags (entity attacker, entity targ, float f)
+void GiveFrags (entity attacker, entity targ, float f, float deathtype)
 {
 	float w;
 
@@ -139,19 +139,36 @@ void GiveFrags (entity attacker, entity targ, float f)
 	if(targ != attacker) // not for suicides
 	if(g_weaponarena_random)
 	{
-		// after a frag, choose another random weapon set
-		if(inWarmupStage)
-			w = warmup_start_weapons;
-		else
-			w = start_weapons;
+		// after a frag, exchange the current weapon (or the culprit, if detectable) by a new random weapon
+		float culprit;
+		culprit = DEATH_WEAPONOF(deathtype);
+		if(!culprit || !(attacker.weapons & W_WeaponBit(culprit)))
+			culprit = attacker.weapon;
 
-		attacker.weapons = randombits(w - (w & W_WeaponBit(attacker.weapon)), g_weaponarena_random, TRUE);
-		if(attacker.weapons < 0)
+		if(g_weaponarena_random_with_laser && culprit == WEPBIT_LASER)
+		{
+			// no exchange
+		}
+		else
 		{
-			// error from randombits: no weapon available
-			// this means we can just give ALL weapons
-			attacker.weapons = w;
+			if(inWarmupStage)
+				w = warmup_start_weapons;
+			else
+				w = start_weapons;
+
+			// all others (including the culprit): remove
+			w &~= self.weapons;
+
+			// among the remaining ones, choose one by random
+			w = randombits(w, 1, FALSE);
+			if(w)
+			{
+				attacker.weapons |= w;
+				attacker.weapons &~= W_WeaponBit(culprit);
+			}
 		}
+
+		// after a frag, choose another random weapon set
 		if not(attacker.weapons & W_WeaponBit(attacker.weapon))
 			W_SwitchWeapon_Force(attacker, w_getbestweapon(attacker));
 	}