From 09b3d0eb3e233179f07f0de4ec77cbe28f6bfd0c Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 10 Jan 2010 19:53:56 +0000 Subject: [PATCH] Fix alignment of the effects dialog; add checkboxes for motion- and damegeblur git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8492 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- .../qcsrc/menu/nexuiz/dialog_settings_audio.c | 3 +-- .../menu/nexuiz/dialog_settings_effects.c | 21 +++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_audio.c b/data/qcsrc/menu/nexuiz/dialog_settings_audio.c index c69268cdc..9859bc70e 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_audio.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_audio.c @@ -37,7 +37,6 @@ void fillNexuizAudioSettingsTab(entity me) me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Ambient:")); makeMulti(s, "snd_entchannel2volume"); me.TD(me, 1, 2, s); - setDependentStringNotEqual(e, "volume", "0"); setDependentStringNotEqual(s, "volume", "0"); me.TR(me); me.TDempty(me, 0.2); @@ -173,4 +172,4 @@ void fillNexuizAudioSettingsTab(entity me) me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "snd_restart; sendcvar cl_hitsound; sendcvar cl_autotaunt; sendcvar cl_voice_directional; sendcvar cl_voice_directional_taunt_attenuation", COMMANDBUTTON_APPLY)); } -#endif \ No newline at end of file +#endif diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c index 3c7855583..15ca3dc6c 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c @@ -31,7 +31,7 @@ float someShadowCvarIsEnabled(entity box) void fillNexuizEffectsSettingsTab(entity me) { - entity e; + entity e, s; float n; me.TR(me); me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Quality preset:")); @@ -159,16 +159,19 @@ void fillNexuizEffectsSettingsTab(entity me) me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_bloom", "Bloom")); setDependent(e, "r_hdr", 0, 0); me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_hdr", "High Dynamic Range (HDR)")); - me.TR(me); me.TR(me); - me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Motion blur:")); - me.TD(me, 1, 2, e = makeNexuizSlider(0, 1, 0.1, "r_motionblur")); - me.TR(me); - me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Damage blur:")); - setDependent(e, "r_motionblur", 0, 1); - me.TD(me, 1, 2, e = makeNexuizSlider(0, 1, 0.1, "r_damageblur")); - setDependent(e, "r_motionblur", 0, 1); + s = makeNexuizSlider(0.1, 1, 0.1, "r_motionblur"); + me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, s, "Motion blur:")); + if(s.value != e.savedValue) + e.savedValue = 0.5; // default + me.TD(me, 1, 2, s); + me.TR(me); + s = makeNexuizSlider(0.1, 1, 0.1, "r_damageblur"); + me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, s, "Damage blur:")); + if(s.value != e.savedValue) + e.savedValue = 0.4; // default + me.TD(me, 1, 2, s); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY)); -- 2.39.2