From: Samual Date: Sun, 12 Dec 2010 20:52:06 +0000 (-0500) Subject: Merge remote branch 'origin/master' into samual/keepaway X-Git-Tag: xonotic-v0.5.0~318^2~123^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c4052acb21de917a6010586315bf102e262eb986;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/master' into samual/keepaway Hope to god that this works. --- c4052acb21de917a6010586315bf102e262eb986 diff --cc qcsrc/server/mutators/gamemode_keepaway.qc index 104af5475,9fb47afbb..04939e839 --- a/qcsrc/server/mutators/gamemode_keepaway.qc +++ b/qcsrc/server/mutators/gamemode_keepaway.qc @@@ -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)