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

diff --cc gamemodes.cfg
Simple merge

diff --cc qcsrc/server/mutators/gamemode_onslaught.qc
index 1e160bec71d3bfe271e5e48a6bf55f30ab4156d2,04a5ef303f90462d81b7b36bcce1a10cbb0ce604..3801de302d9c80fa2ab8cb0e7e3215d01dbf0ff4
--- 1/qcsrc/server/mutators/gamemode_onslaught.qc
--- 2/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;
  }