From: Mario <mario.mario@y7mail.com>
Date: Mon, 6 Jan 2014 03:05:51 +0000 (+1100)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=490131c400cb22079f9713ecb2d2830b84118987;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters
---

490131c400cb22079f9713ecb2d2830b84118987
diff --cc qcsrc/server/mutators/gamemode_ca.qc
index 74a7fd38a,9df6b42a2..8a6315c42
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@@ -272,25 -268,6 +268,12 @@@ MUTATOR_HOOKFUNCTION(ca_PlayerDamage_Sp
  	return FALSE;
  }
  
 +MUTATOR_HOOKFUNCTION(ca_PlayerRegen)
 +{
 +	// no regeneration in CA
 +	return TRUE;
 +}
 +
- // scoreboard setup
- void ca_ScoreRules()
- {
- 	ScoreRules_basics(2, SFL_SORT_PRIO_PRIMARY, 0, TRUE);
- 	ScoreInfo_SetLabel_TeamScore  (ST_CA_ROUNDS,    "rounds",    SFL_SORT_PRIO_PRIMARY);
- 	ScoreRules_basics_end();
- }
- 
- void ca_DelayedInit() // Do this check with a delay so we can wait for teams to be set up.
- {
- 	ca_ScoreRules();
- }
- 
  void ca_Initialize()
  {
  	allowed_to_spawn = TRUE;