From: Samual Lenks <samual@xonotic.org>
Date: Tue, 5 Mar 2013 02:58:00 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/terencehill/onslaught_bugfixes'
X-Git-Tag: xonotic-v0.7.0~62^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7eb9a7c4ea3b9aff3a780584931a75a1fe25a8ad;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/terencehill/onslaught_bugfixes'
---

7eb9a7c4ea3b9aff3a780584931a75a1fe25a8ad
diff --cc qcsrc/server/mutators/gamemode_onslaught.qc
index 1e160bec7,04a5ef303..3801de302
--- a/qcsrc/server/mutators/gamemode_onslaught.qc
+++ b/qcsrc/server/mutators/gamemode_onslaught.qc
@@@ -1438,10 -1399,10 +1399,10 @@@ void spawnfunc_onslaught_controlpoint(
  	waypoint_spawnforitem(self);
  
  	WaypointSprite_SpawnFixed(string_null, self.origin + '0 0 128', self, sprite, RADARICON_NONE, '0 0 0');
 -	WaypointSprite_UpdateRule(self.sprite, COLOR_TEAM2, SPRITERULE_TEAMPLAY);
 +	WaypointSprite_UpdateRule(self.sprite, NUM_TEAM_2, SPRITERULE_TEAMPLAY);
  
  	onslaught_updatelinks();
- 	
+ 
  	self.reset = onslaught_controlpoint_reset;
  }