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

Conflicts:
	qcsrc/server/teamplay.qc

diff --cc qcsrc/server/cl_weapons.qc
Simple merge

diff --cc qcsrc/server/miscfunctions.qc
Simple merge

diff --cc qcsrc/server/teamplay.qc
index 533fe3fedfe3d60c9c6fa7c0c5004fa7816a649d,3bb2ad156638eebf23ef0a69cd635ecc6d00471e..960e59d67492f8ddf5ad3959515d303932c9f043
--- 1/qcsrc/server/teamplay.qc
--- 2/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);