From a37ca21f9423505c4dfb28c2be42a326d9e82546 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 12 Jun 2020 11:59:35 +1000 Subject: [PATCH] Don't adjust player alpha for the invisibility powerup while inside a vehicle, fixes #2460 --- .../mutators/mutator/instagib/sv_instagib.qc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc index 0e0716dd1..0bcea9885 100644 --- a/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc +++ b/qcsrc/common/mutators/mutator/instagib/sv_instagib.qc @@ -235,8 +235,11 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerPowerups) play_countdown(player, STAT(STRENGTH_FINISHED, player), SND_POWEROFF); if (time > STAT(STRENGTH_FINISHED, player)) { - player.alpha = default_player_alpha; - player.exteriorweaponentity.alpha = default_weapon_alpha; + if(!this.vehicle) // already reset upon exit + { + player.alpha = default_player_alpha; + player.exteriorweaponentity.alpha = default_weapon_alpha; + } player.items &= ~ITEM_Invisibility.m_itemid; Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_POWERDOWN_INVISIBILITY); } @@ -245,8 +248,11 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerPowerups) { if (time < STAT(STRENGTH_FINISHED, player)) { - player.alpha = autocvar_g_instagib_invis_alpha; - player.exteriorweaponentity.alpha = autocvar_g_instagib_invis_alpha; + if(!this.vehicle) // incase the player is given powerups while inside a vehicle + { + player.alpha = autocvar_g_instagib_invis_alpha; + player.exteriorweaponentity.alpha = autocvar_g_instagib_invis_alpha; + } player.items |= ITEM_Invisibility.m_itemid; Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_POWERUP_INVISIBILITY, player.netname); Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_POWERUP_INVISIBILITY); -- 2.39.2