From: Jakob MG <jakob_mg@hotmail.com>
Date: Sat, 14 Jan 2012 09:23:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into tzork/gm_nexball
X-Git-Tag: xonotic-v0.6.0~40^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2d2a167c9d4f4ffd8f4234309c936d99e842869b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into tzork/gm_nexball

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

2d2a167c9d4f4ffd8f4234309c936d99e842869b
diff --cc defaultXonotic.cfg
index 084cc67f4,52c14b2be..db0e26f35
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -619,15 -577,7 +577,14 @@@ seta g_keyhunt_point_leadlimit -1	"Keyh
  seta g_race_laps_limit -1	"Race laps limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  seta g_nexball_goallimit -1 "Nexball goal limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
  seta g_nexball_goalleadlimit -1 "Nexball goal lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 +seta g_nexball_safepass_maxdist 5000    // Max distance to allow save fassping (0 to turn off safe passing)
 +seta g_nexball_safepass_turnrate 0.1    // How fast the safe-pass ball can habge direction
 +seta g_nexball_safepass_holdtime 0.75   // How long to remeber last teammate you pointed at
 +seta g_nexball_viewmodel_scale 0.25     // How large the ball for the carrier
 +seta g_nexball_viewmodel_offset "8 8 0" // Where the ball is located on carrier "forward right up"
 +seta g_nexball_tackling 1               // Allow ball theft?
 +
  
- seta g_ctf_win_mode 0	"0: captures only, 1: captures, then points, 2: points only"
  seta g_ctf_ignore_frags 0	"1: regular frags give no points"
  
  set g_freezetag 0 "Freeze Tag: Freeze the opposing team(s) to win, unfreeze teammates by standing next to them"
diff --cc qcsrc/server/teamplay.qc
index 9c10089ca,f0ce8fd14..533fe3fed
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@@ -358,16 -257,12 +256,13 @@@ void InitGameplayMode(
  
  	if(g_nexball)
  	{
-         game = GAME_NEXBALL;
-         gamemode_name = "Nexball";
 -		fraglimit_override = autocvar_g_nexball_goallimit;
 -		leadlimit_override = autocvar_g_nexball_goalleadlimit;
 -		ActivateTeamplay();
 -		nb_init();
 -		have_team_spawns = -1; // request team spawns
 +        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)
  	{