From: Rudolf Polzer <divVerent@xonotic.org>
Date: Tue, 21 Dec 2010 09:46:09 +0000 (+0100)
Subject: add a missing variable
X-Git-Tag: xonotic-v0.1.0preview^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4fc009b7cd25fa3f5b823237aaec11167685e4b6;p=xonotic%2Fxonotic-data.pk3dir.git

add a missing variable
---

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 12731fd73..48873eccc 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -722,6 +722,7 @@ float autocvar_g_freezetag_revive_extra_size;
 float autocvar_g_freezetag_revive_time;
 float autocvar_g_freezetag_warmup;
 #define autocvar_g_friendlyfire cvar("g_friendlyfire")
+#define autocvar_g_friendlyfire_virtual cvar("g_friendlyfire_virtual")
 float autocvar_g_full_getstatus_responses;
 float autocvar_g_fullbrightitems;
 float autocvar_g_fullbrightplayers;
diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 113e9f427..a40982ce7 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -915,8 +915,15 @@ void readplayerstartcvars()
 
 	g_weaponarena = 0;
 	s = cvar_string("g_weaponarena");
-	if (s == "0")
+	if (s == "0" || s == "")
 	{
+		if(g_lms || g_ca)
+			s = "most";
+	}
+
+	if (s == "off")
+	{
+		// forcibly turn off weaponarena
 	}
 	else if (s == "all")
 	{