From 3bb4959dfce6b83dd48887b8a8f3812e2c33bf14 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sun, 9 Nov 2008 07:20:21 +0000
Subject: [PATCH] weapon arena modes "all" and "most"

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5021 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/defaultNexuiz.cfg             |  2 +-
 data/nexuiz-credits.txt            |  2 +-
 data/qcsrc/server/miscfunctions.qc | 28 +++++++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg
index 6cc4c1683..d075c8909 100644
--- a/data/defaultNexuiz.cfg
+++ b/data/defaultNexuiz.cfg
@@ -285,7 +285,7 @@ set g_minstagib_invis_alpha 0.05
 set g_minstagib_speed_jumpheight 1.8
 set g_minstagib_speed_moverate 1.25
 set g_vampire 0
-set g_weaponarena "0" // put in a list of weapons to enable a weapon arena mode
+set g_weaponarena "0" // put in a list of weapons to enable a weapon arena mode, or try "all" or "most"
 set g_shocknex 0
 set g_laserguided_missile 0
 set g_midair 0
diff --git a/data/nexuiz-credits.txt b/data/nexuiz-credits.txt
index 1e9880939..25e2edac9 100644
--- a/data/nexuiz-credits.txt
+++ b/data/nexuiz-credits.txt
@@ -132,5 +132,5 @@ Christian Ice
 FruitieX
 Edward "Ed" Holness
 MirceaKitsune
-ROnan
+Ronan
 Shaggy
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 73bd984e9..4cc9b8cb7 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -753,7 +753,33 @@ void readplayerstartcvars()
 
 	g_weaponarena = 0;
 	s = cvar_string("g_weaponarena");
-	if(s != "0")
+	if(s == "0")
+	{
+	}
+	else if(s == "all")
+	{
+		g_weaponarena_list = "All Weapons";
+		for(j = WEP_FIRST; j <= WEP_LAST; ++j)
+		{
+			e = get_weaponinfo(j);
+			g_weaponarena |= e.weapons;
+			weapon_action(e.weapon, WR_PRECACHE);
+		}
+	}
+	else if(s == "most")
+	{
+		g_weaponarena_list = "Most Weapons";
+		for(j = WEP_FIRST; j <= WEP_LAST; ++j)
+		{
+			e = get_weaponinfo(j);
+			if(e.spawnflags & 1)
+			{
+				g_weaponarena |= e.weapons;
+				weapon_action(e.weapon, WR_PRECACHE);
+			}
+		}
+	}
+	else
 	{
 		t = tokenize_sane(s);
 		g_weaponarena_list = "";
-- 
2.39.2