From: Rudolf Polzer Date: Mon, 9 Feb 2015 12:15:20 +0000 (+0100) Subject: COMPAT_XON080_BGMVOLUME should be the name. X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=23c46cf51a5c309a59ac0acc5100441c0ec6da64;p=xonotic%2Fxonotic-data.pk3dir.git COMPAT_XON080_BGMVOLUME should be the name. --- diff --git a/qcsrc/client/target_music.qc b/qcsrc/client/target_music.qc index 988c2cb46..7eb809b77 100644 --- a/qcsrc/client/target_music.qc +++ b/qcsrc/client/target_music.qc @@ -37,7 +37,7 @@ void TargetMusic_Advance() if(vol != vol0) { if(e.noise == "") -#ifdef COMPAT_XON070_BGMVOLUME +#ifdef COMPAT_XON080_BGMVOLUME cvar_settemp("bgmvolume", ftos(vol)); #else cvar_set("bgmvolume", ftos(vol)); diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh index 111e13b77..fcbce457b 100644 --- a/qcsrc/common/util-pre.qh +++ b/qcsrc/common/util-pre.qh @@ -3,7 +3,7 @@ #ifndef NOCOMPAT #define COMPAT_NO_MOD_IS_XONOTIC - #define COMPAT_XON070_BGMVOLUME + #define COMPAT_XON080_BGMVOLUME #endif #ifndef QCC_SUPPORT_ACCUMULATE diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.qc b/qcsrc/menu/xonotic/dialog_settings_audio.qc index e71bbd736..8e78a6c0a 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.qc +++ b/qcsrc/menu/xonotic/dialog_settings_audio.qc @@ -30,7 +30,7 @@ void XonoticAudioSettingsTab_fill(entity me) me.TR(me); me.TDempty(me, 0.2); s = makeXonoticDecibelsSlider(-40, 0, 0.4, "musicvolume"); -#ifdef COMPAT_XON070_BGMVOLUME +#ifdef COMPAT_XON080_BGMVOLUME makeMulti(s, "bgmvolume"); #endif me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Music:")));