From 18ac9cf291115bf68058cca32be8e25d42193873 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sat, 26 Feb 2011 19:56:35 +0200 Subject: [PATCH] Some more fixes to that hack. Not sure what more can be done. --- data/qcsrc/client/View.qc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 0228949c..4f768092 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -707,8 +707,8 @@ void CSQC_UpdateView(float w, float h) // Without it, adjusting the music or master sound sliders while fading that volume would have bad results. // This needs to be done in a better way! Currently, changing the volume sliders will just reset the fading. - volume_modify_default_1 = volume_modify_1 = cvar("volume"); - volume_modify_default_2 = volume_modify_2 = cvar("bgmvolume"); + volume_modify_default_1 = cvar("menu_volume"); + volume_modify_default_2 = cvar("menu_bgmvolume"); volume_modify_changed_1 = cvar("menu_volume"); volume_modify_changed_2 = cvar("menu_bgmvolume"); @@ -746,7 +746,7 @@ void CSQC_UpdateView(float w, float h) else if (volume_modify_2 < volume_modify_2_target - volume_modify_fade) volume_modify_2 += volume_modify_fade; else - volume_modify_2 = volume_modify_1_target; + volume_modify_2 = volume_modify_2_target; cvar_set("volume", ftos(volume_modify_1)); cvar_set("bgmvolume", ftos(volume_modify_2)); -- 2.39.2