Merge branch 'tzork/gm_nexball' of git://de.git.xonotic.org/xonotic/xonotic-data...
authorJakob MG <jakob_mg@hotmail.com>
Sat, 14 Jan 2012 09:26:44 +0000 (10:26 +0100)
committerJakob MG <jakob_mg@hotmail.com>
Sat, 14 Jan 2012 09:26:44 +0000 (10:26 +0100)
Conflicts:
qcsrc/server/teamplay.qc

1  2 
qcsrc/server/cl_weapons.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/teamplay.qc

Simple merge
Simple merge
@@@ -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);