From: Samual Lenks <samual@xonotic.org>
Date: Mon, 23 Jul 2012 04:38:50 +0000 (-0400)
Subject: Shotgun is no longer a spawn weapon :D
X-Git-Tag: xonotic-v0.8.0~152^2~408^2~58
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ab135d8f681ebb8da9d4d5507b09e425a9861a60;p=xonotic%2Fxonotic-data.pk3dir.git

Shotgun is no longer a spawn weapon :D
---

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 70523892a..5ea80b479 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -801,11 +801,11 @@ float want_weapon(string cvarprefix, entity weaponinfo, float allguns)
 			d = FALSE;
 	}
 	else if (g_cts)
-		d = (i == WEP_SHOTGUN);
+		d = (i == WEP_SHOTGUN); // todo: how to handle shotgun in CTS mode? we're removing it.. so.... 
 	else if (g_nexball)
 		d = 0; // weapon is set a few lines later
 	else
-		d = (i == WEP_LASER || i == WEP_SHOTGUN);
+		d = (i == WEP_LASER);
 		
 	if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook
 		d |= (i == WEP_HOOK);