From ab84cc0bd56a10f67c243002cd262d36fc0eb926 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sun, 29 Nov 2009 13:23:15 +0000
Subject: [PATCH] try improving warmup weapon selection code; also:
 g_start_weapon_* -2 makes the gun not appear in DM (overrides gametype
 default), except in allguns game types (like LMS)

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8331 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/miscfunctions.qc | 85 +++++++++++++++---------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 586951729..d7a0bfa44 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -843,6 +843,38 @@ float g_ghost_items;
 
 entity get_weaponinfo(float w);
 
+float want_weapon(string cvarprefix, entity weaponinfo, float allguns)
+{
+	var float i = weaponinfo.weapon;
+
+	if (!i)
+		return 0;
+
+	var float t = cvar(strcat(cvarprefix, weaponinfo.netname));
+
+	if (t < 0) // "default" weapon selection
+	{
+		if (g_lms || g_ca || allguns)
+			t = (weaponinfo.spawnflags & WEPSPAWNFLAG_NORMAL);
+		else if(t < -1)
+			t = 0;
+		else if (g_race || g_cts)
+			t = (i == WEP_LASER);
+		else if (g_nexball)
+			t = 0; // weapon is set a few lines later
+		else
+			t = (i == WEP_LASER || i == WEP_SHOTGUN);
+		if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook
+			t |= (i == WEP_HOOK);
+	}
+
+	// we cannot disable porto in Nexball, we must force it
+	if(g_nexball && i == WEP_PORTO)
+		t = 1;
+
+	return t;
+}
+
 float NixNex_CanChooseWeapon(float wpn);
 void readplayerstartcvars()
 {
@@ -995,34 +1027,8 @@ void readplayerstartcvars()
         for (i = WEP_FIRST; i <= WEP_LAST; ++i)
         {
             e = get_weaponinfo(i);
-            if (!(e.weapon))
-                continue;
-
-            t = cvar(strcat("g_start_weapon_", e.netname));
-
-	    if (t == -1) // "default" weapon selection
-            {
-                if (g_lms || g_ca)
-                    t = (e.spawnflags & WEPSPAWNFLAG_NORMAL);
-                else if (g_race || g_cts)
-                    t = (i == WEP_LASER);
-                else if (g_nexball)
-                    t = 0; // weapon is set a few lines later
-                else
-                    t = (i == WEP_LASER || i == WEP_SHOTGUN);
-                if (g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook
-                    t += (i == WEP_HOOK);
-            }
-	    else if (t == -2 && (g_ca || g_lms))
-		t = 1;
-	    else if (t < 0)
-		t = 0;
-
-            if (g_nexball && i == WEP_PORTO)
-                t=1;
-
-            if (t)
-            {
+			if(want_weapon("g_start_weapon_", e, FALSE))
+			{
                 start_weapons |= e.weapons;
                 weapon_action(e.weapon, WR_PRECACHE);
             }
@@ -1052,20 +1058,15 @@ void readplayerstartcvars()
             }
             warmup_start_health = cvar("g_warmup_start_health");
             warmup_start_armorvalue = cvar("g_warmup_start_armor");
-            if (cvar("g_warmup_allguns"))
-            {
-                for (i = WEP_FIRST; i <= WEP_LAST; ++i)
-                {
-                    e = get_weaponinfo(i);
-                    if (!(e.weapon))
-                        continue;
-                    if (e.spawnflags & WEPSPAWNFLAG_NORMAL)
-                    {
-                        warmup_start_weapons |= e.weapons;
-                        weapon_action(e.weapon, WR_PRECACHE);
-                    }
-                }
-            }
+			for (i = WEP_FIRST; i <= WEP_LAST; ++i)
+			{
+				e = get_weaponinfo(i);
+				if(want_weapon("g_start_weapon_", e, cvar("g_warmup_allguns")))
+				{
+					start_weapons |= e.weapons;
+					weapon_action(e.weapon, WR_PRECACHE);
+				}
+			}
         }
     }
 
-- 
2.39.2