From: Mario Date: Fri, 17 Jul 2020 08:10:24 +0000 (+1000) Subject: Fix compile X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eed97342a18a79ba3f229067f853702829d1252c;p=xonotic%2Fxonotic-data.pk3dir.git Fix compile --- diff --git a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc index 15b6e9d51..945d506dc 100644 --- a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc +++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc @@ -227,7 +227,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, SetPlayerAlpha) { entity player = M_ARGV(0, entity); - if(time < player.strength_finished) + if(time < STAT(STRENGTH_FINISHED, player)) { M_ARGV(1, float) = min(M_ARGV(1, float), autocvar_g_instagib_invis_alpha); // player_alpha M_ARGV(2, float) = min(M_ARGV(2, float), autocvar_g_instagib_invis_alpha); // weapon_alpha diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index 99077dcfe..68c48ac64 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -183,7 +183,7 @@ bool autocvar_g_norecoil; float autocvar_g_items_mindist; float autocvar_g_items_maxdist; int autocvar_g_pickup_items; -float autocvar_g_player_alpha; +float autocvar_g_player_alpha = 1; float autocvar_g_player_brightness; float autocvar_g_player_damageforcescale = 2; bool autocvar_g_playerclip_collisions; diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index dd3cd6330..838b3078a 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -1433,9 +1433,6 @@ void player_powerups(entity this) { SetPlayerAlpha(this); - // add a way to see what the items were BEFORE all of these checks for the mutator hook - int items_prev = this.items; - if((this.items & IT_USING_JETPACK) && !IS_DEAD(this) && !game_stopped) this.modelflags |= MF_ROCKET; else