r5021 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-09 02:20:21 -0500 (Sun, 09 Nov 2008)
New Revision: 5021

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/nexuiz-credits.txt
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
weapon arena modes "all" and "most"


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-11-08 21:35:10 UTC (rev 5020)
+++ trunk/data/defaultNexuiz.cfg	2008-11-09 07:20:21 UTC (rev 5021)
@@ -285,7 +285,7 @@
 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

Modified: trunk/data/nexuiz-credits.txt
===================================================================
--- trunk/data/nexuiz-credits.txt	2008-11-08 21:35:10 UTC (rev 5020)
+++ trunk/data/nexuiz-credits.txt	2008-11-09 07:20:21 UTC (rev 5021)
@@ -132,5 +132,5 @@
 FruitieX
 Edward "Ed" Holness
 MirceaKitsune
-ROnan
+Ronan
 Shaggy

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-11-08 21:35:10 UTC (rev 5020)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-11-09 07:20:21 UTC (rev 5021)
@@ -753,8 +753,34 @@
 
 	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 = "";
 		for(i = 0; i < t; ++i)