Merge remote branch 'origin/master' into samual/keepaway
authorSamual <samual@xonotic.org>
Sun, 12 Dec 2010 20:52:06 +0000 (15:52 -0500)
committerSamual <samual@xonotic.org>
Sun, 12 Dec 2010 20:52:06 +0000 (15:52 -0500)
Hope to god that this works.

1  2 
defaultXonotic.cfg
qcsrc/server/mutators/gamemode_keepaway.qc

Simple merge
@@@ -277,19 -279,14 +277,19 @@@ MUTATOR_HOOKFUNCTION(ka_PlayerDamage) /
  
  MUTATOR_HOOKFUNCTION(ka_PlayerPowerups)
  {
 +      // right now this hook doesn't make much sense (It's actually useless this way except for minstagib invisibility alpha) 
 +      // but in the future it's supposed to allow me to do some extra stuff with waypointsprites and invisibility powerup
 +      // So bare with me until I can fix a certain bug with ka_ballcarrier_waypointsprite_visible_for_player() 
 +      
 +      // also note that this structure makes no sense (Rather there is a better way to do it) the way it's currently applied
 +      // again just bare with me as this is for a future feature. 
 +
        if(self.ballcarried)
        { 
 -              // if the player has the ball, force ballcarrier alpha upon them
 +              // force the default ballcarrier alpha on the player if they have the ball
-               self.alpha = cvar("g_keepaway_ballcarrier_alpha");
-               self.exteriorweaponentity.alpha = cvar("g_keepaway_ballcarrier_alpha");
+               self.alpha = autocvar_g_keepaway_ballcarrier_alpha;
+               self.exteriorweaponentity.alpha = autocvar_g_keepaway_ballcarrier_alpha;
        
 -              // if we're in minstagib and a ballcarrier has just picked up invisibility, 
 -              // notify all the other players that the ballcarrier no longer has a waypoint
                if(g_minstagib)
                {
                        if(olditems & IT_STRENGTH)