From: Jakob MG <jakob_mg@hotmail.com>
Date: Sat, 14 Jan 2012 09:26:44 +0000 (+0100)
Subject: Merge branch 'tzork/gm_nexball' of git://de.git.xonotic.org/xonotic/xonotic-data... 
X-Git-Tag: xonotic-v0.6.0~40^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=70dbd52151c76d8300738a163ed92768ad606b15;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'tzork/gm_nexball' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into tzork/gm_nexball

Conflicts:
	qcsrc/server/teamplay.qc
---

70dbd52151c76d8300738a163ed92768ad606b15
diff --cc qcsrc/server/teamplay.qc
index 533fe3fed,3bb2ad156..960e59d67
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@@ -256,14 -256,14 +256,13 @@@ void InitGameplayMode(
  
  	if(g_nexball)
  	{
 -
 -		fraglimit_override = autocvar_g_nexball_goallimit;
 -		leadlimit_override = autocvar_g_nexball_goalleadlimit;
 -		ActivateTeamplay();
 -		have_team_spawns = -1; // request team spawns
 -        MUTATOR_ADD(gamemode_nexball);
 +        fraglimit_override = autocvar_g_nexball_goallimit;
 +        leadlimit_override = autocvar_g_nexball_goalleadlimit;
 +        ActivateTeamplay();
 +        have_team_spawns = -1; // request team spawns
 +	    MUTATOR_ADD(gamemode_nexball);
  	}
          
- 
  	if(g_keepaway)
  	{
  		MUTATOR_ADD(gamemode_keepaway);