Some more fixes to that hack. Not sure what more can be done.
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 26 Feb 2011 17:56:35 +0000 (19:56 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 26 Feb 2011 17:56:35 +0000 (19:56 +0200)
data/qcsrc/client/View.qc

index 0228949..4f76809 100644 (file)
@@ -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.\r
                        // This needs to be done in a better way! Currently, changing the volume sliders will just reset the fading.\r
 \r
-                       volume_modify_default_1 = volume_modify_1 = cvar("volume");\r
-                       volume_modify_default_2 = volume_modify_2 = cvar("bgmvolume");\r
+                       volume_modify_default_1 = cvar("menu_volume");\r
+                       volume_modify_default_2 = cvar("menu_bgmvolume");\r
 \r
                        volume_modify_changed_1 = cvar("menu_volume");\r
                        volume_modify_changed_2 = cvar("menu_bgmvolume");\r
@@ -746,7 +746,7 @@ void CSQC_UpdateView(float w, float h)
                                else if (volume_modify_2 < volume_modify_2_target - volume_modify_fade)\r
                                        volume_modify_2 += volume_modify_fade;\r
                                else\r
-                                       volume_modify_2 = volume_modify_1_target;\r
+                                       volume_modify_2 = volume_modify_2_target;\r
 \r
                                cvar_set("volume", ftos(volume_modify_1));\r
                                cvar_set("bgmvolume", ftos(volume_modify_2));\r