From: terencehill <piuntn@gmail.com>
Date: Tue, 12 Feb 2013 14:29:25 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/ca_arena_mutators
X-Git-Tag: xonotic-v0.7.0~61^2~51
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2183ba664c674c396a5c37a69a944f4c698eea70;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/ca_arena_mutators
---

2183ba664c674c396a5c37a69a944f4c698eea70
diff --cc qcsrc/server/miscfunctions.qc
index 53719e075,e8972ca8e..7a75446e2
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -1264,13 -1260,9 +1260,9 @@@ void readlevelcvars(void
      if(!g_weapon_stay)
          g_weapon_stay = cvar("g_weapon_stay");
  
 -	if not(inWarmupStage && !g_ca)
 +	if not(inWarmupStage)
  		game_starttime = cvar("g_start_delay");
  
- 	sv_pitch_min = cvar("sv_pitch_min");
- 	sv_pitch_max = cvar("sv_pitch_max");
- 	sv_pitch_fixyaw = cvar("sv_pitch_fixyaw");
- 
  	readplayerstartcvars();
  }