Tweak the system sound to use 0.5 as the default volume, instead of 1.0. This allows...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index c66b4f3d37596e4ccbf6a7df773ad508835b9bb0..213f9fd19074ccc3d819cacf3625bcb10922624a 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1614,10 +1614,11 @@ set g_healthsize_min 50 "Player size may not drop below this amount of health"
 set g_healthsize_max 150 "Player size may not grow past this amount of health"\r
 \r
 // part of an ugly hack for the menu audio sliders to work with the cutsound feature\r
-seta menu_volume 0.5\r
-seta menu_bgmvolume 1\r
+seta menu_volume 1\r
+seta menu_bgmvolume 0.5\r
 set volume $menu_volume\r
 set bgmvolume $menu_bgmvolume\r
+set mastervolume 1.4\r
 \r
 set sv_weaponstats_damagefile "" "when set to a file name, per-weapon damage stats get written to that file"\r
 set sv_weaponstats_killfile "" "when set to a file name, per-weapon kill stats get written to that file"\r

diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh
index 65f48568339e918c7c921ca32b9987012acc79bc..44f19165628906b02041ddb79bec533dc1518ab9 100644 (file)
--- a/data/qcsrc/common/constants.qh
+++ b/data/qcsrc/common/constants.qh
@@ -397,8 +397,8 @@ float       ATTN_IDLE                               = 2;
 float  ATTN_STATIC                             = 3;\r
 float  ATTN_MAX                                = 3.984375;\r
 \r
-#define VOL_BASE 0.7\r
-#define VOL_BASEVOICE 1.0\r
+#define VOL_BASE 0.3\r
+#define VOL_BASEVOICE 0.5\r
 \r
 // this sets sounds and other properties of the projectiles in csqc\r
 float PROJECTILE_EXAMPLE = 1; // VoreTournament doesn't use any projectiles by default, so this example will guide us if any will be added in the future\r

diff --git a/data/qcsrc/menu/voret/slider_decibels.c b/data/qcsrc/menu/voret/slider_decibels.c
index c699588631cd084fa549a36192d5db282841714d..e455b81a625e749d43499431ed1d46aff2dcd1d9 100644 (file)
--- a/data/qcsrc/menu/voret/slider_decibels.c
+++ b/data/qcsrc/menu/voret/slider_decibels.c
@@ -41,7 +41,12 @@ void saveCvarsVoretDecibelsSlider(entity me)
        if(me.value < -33)\r
                cvar_set(me.cvarName, "0");\r
        else\r
-               cvar_set(me.cvarName, ftos(pow(10, me.value / 10)));\r
+       {\r
+               if(me.cvarName == "menu_bgmvolume")\r
+                       cvar_set(me.cvarName, ftos(pow(10, me.value / 10) / 2)); // due to system settings, music volume must be twice as low\r
+               else\r
+                       cvar_set(me.cvarName, ftos(pow(10, me.value / 10)));\r
+       }\r
 }\r
 \r
 string valueToTextVoretDecibelsSlider(entity me, float v)\r