]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'LegendaryGuard/armorizing_and_dark_nades' into LegendaryGuard/cyber
authorLegendaryGuard <rootuser999@gmail.com>
Wed, 5 Jan 2022 18:31:55 +0000 (19:31 +0100)
committerLegendaryGuard <rootuser999@gmail.com>
Wed, 5 Jan 2022 18:31:55 +0000 (19:31 +0100)
1  2 
qcsrc/common/mutators/mutator/nades/nades.qh

index b72bb50961662a0a7e8c9577a767f02f8c0a116a,eba6f2aa0410b708ffd17f95b8a4bc3e4c0f4051..8e3cca874e46d10bdab22378ac4651e372e9ea5e
@@@ -318,10 -256,16 +256,16 @@@ MUTATOR_HOOKFUNCTION(cl_darkblink, Draw
  
  MUTATOR_HOOKFUNCTION(cl_darkblink, HUD_Draw_overlay)
  {
-       if(!darkblink && !quadratic2)
+       if(!darkblink)
                return false;
 -      if(!STAT(GAME_STOPPED) && !warmup_stage)
+       
+       if (g_stat_HEALTH < 0)
+               darkblink = false;
+       
++      if(STAT(GAME_STOPPED))
+               darkblink = false;
  
-       if(time <= dark_fadetime && autocvar_hud_panel_darkradar_maximised_zoom_scale == 1)
+       if(time <= dark_fadetime)
        {
                HUD_DarkBlinking();
                return false;