From: Samual Lenks <samual@xonotic.org>
Date: Sun, 24 Nov 2013 04:33:51 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/Mario/arena_nuke'
X-Git-Tag: xonotic-v0.8.0~259
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=04ab0ff7c3c5fcfe9780eadccfd5abd03d25b181;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/arena_nuke'

* origin/Mario/arena_nuke:
  Remove arena gamemode

Conflicts:
	qcsrc/server/command/cmd.qc
	qcsrc/server/mutators/gamemode_arena.qc
---

04ab0ff7c3c5fcfe9780eadccfd5abd03d25b181
diff --cc qcsrc/server/autocvars.qh
index 7d920fb0c,065f93d5f..c60f25152
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -70,13 -70,8 +70,7 @@@ float autocvar_ekg
  #define autocvar_fraglimit_override cvar("fraglimit_override")
  float autocvar_g_allow_oldnexbeam;
  float autocvar_g_antilag;
 -float autocvar_g_antilag_bullets;
  float autocvar_g_antilag_nudge;
- float autocvar_g_arena_maxspawned;
- float autocvar_g_arena_point_leadlimit;
- float autocvar_g_arena_point_limit;
- float autocvar_g_arena_roundbased;
- float autocvar_g_arena_round_timelimit;
- float autocvar_g_arena_warmup;
  float autocvar_g_balance_armor_blockpercent;
  float autocvar_g_balance_armor_limit;
  float autocvar_g_balance_armor_regen;
diff --cc qcsrc/server/command/cmd.qc
index 08bf940db,c70ffb43e..363bb7c4c
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@@ -150,9 -150,9 +150,9 @@@ void ClientCommand_join(float request
  		{
  			if(IS_CLIENT(self))
  			{
- 				if(!IS_PLAYER(self) && !lockteams && !g_arena)
+ 				if(!IS_PLAYER(self) && !lockteams)
  				{
 -					if(nJoinAllowed(self)) 
 +					if(nJoinAllowed(self))
  					{
  						if(autocvar_g_campaign) { campaign_bots_may_start = 1; }