Merge branch 'master' into z411/bai-server

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / view.qc

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 8f919b556ca7d90d54c430cd25d20f758e28588f..e1051b80c29553f000d8888b09ff42f66e7ef3ab 100644 (file)
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -846,7 +846,7 @@ void HitSound()
        float kill_time = STAT(KILL_TIME);
        if (COMPARE_INCREASING(kill_time, kill_time_prev) > autocvar_cl_hitsound_antispam_time)
        {
-               sound(NULL, CH_INFO, SND_KILL, VOL_BASE, ATTN_NONE);
+               sound(NULL, CH_INFO, SND_KILL, VOL_BASE * 1.15, ATTN_NONE);
                kill_time_prev = kill_time;
        }
 }
@@ -917,6 +917,7 @@ void HUD_Draw(entity this)
        UpdateDamage();
        HUD_Crosshair(this);
        HitSound();
+       Local_Notification_Queue_Process();
 }
 
 void ViewLocation_Mouse()
@@ -1155,6 +1156,12 @@ void HUD_Damage()
                        myhealth_flash += autocvar_hud_damage_fade_rate * frametime; // dead
                }
        }
+       
+       if(myhealth_prev > 1 && myhealth <= 0 && !intermission)
+       {
+               // Just died
+               sound(NULL, CH_INFO, SND_DEATH, VOL_BASE, ATTN_NONE);
+       }
 
        if(spectatee_status == -1 || intermission)
        {