add a missing variable
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 21 Dec 2010 09:46:09 +0000 (10:46 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 21 Dec 2010 09:46:09 +0000 (10:46 +0100)
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc

index 12731fd7395de6026e50c84b9f04d30c76f5b011..48873eccc4609a8faa11620cbecc74ccf44e6b37 100644 (file)
@@ -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;
index 113e9f427df5b8105d918b7483e482142b3d4deb..a40982ce7e2f733f72ac43aedef9564af457c120 100644 (file)
@@ -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")
        {