Merge remote-tracking branch 'origin/terencehill/onslaught_bugfixes'
authorSamual Lenks <samual@xonotic.org>
Tue, 5 Mar 2013 02:58:00 +0000 (21:58 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 5 Mar 2013 02:58:00 +0000 (21:58 -0500)
1  2 
gamemodes.cfg
qcsrc/server/mutators/gamemode_onslaught.qc

diff --cc gamemodes.cfg
Simple merge
@@@ -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;
  }