From 3f3552b3713c4e207b1e364cc3e4f37a64726b65 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Fri, 8 Jul 2011 18:04:33 +0300 Subject: [PATCH] Remove the old saturation slider from the menu, and add the armor based saturation as a post process effect. --- data/qcsrc/client/View.qc | 4 ++-- data/qcsrc/menu/voret/dialog_settings_effects.c | 3 ++- data/qcsrc/menu/voret/dialog_settings_video.c | 5 ----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 843d0df2..e6f9a562 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -808,12 +808,12 @@ void CSQC_UpdateView(float w, float h) cvar_set("r_glsl_postprocess_uservec2_enable", "0"); } - if(cvar("hud_postprocessing") && cvar("hud_saturation")) + if(cvar("hud_postprocessing")) { // change saturation based on the amount of armor we have // ranges between 0 and 50 armor. 0 armor is saturation 0.5, and 0.5 armor or above is saturation 1 - if(armor_enabled && spectatee_status != -1 && getstati(STAT_HEALTH) > 0) + if(cvar("hud_saturation") && armor_enabled && spectatee_status != -1 && getstati(STAT_HEALTH) > 0) { float saturation; saturation = 0.5 + (getstati(STAT_ARMOR) * 1 * 0.01); diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c index 1a75c952..13ba2ff1 100644 --- a/data/qcsrc/menu/voret/dialog_settings_effects.c +++ b/data/qcsrc/menu/voret/dialog_settings_effects.c @@ -178,8 +178,9 @@ void fillVoretEffectsSettingsTab(entity me) e.savedValue = 0.5; // default me.TD(me, 1, 2, s); me.TR(me); - me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Damage & Water blur")); + me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", "Damage & Water blur")); me.TD(me, 1, 1, e = makeVoretCheckBoxEx(0.5, 0, "hud_powerup", "Powerup sharpen")); + me.TD(me, 1, 1, e = makeVoretCheckBox(0, "hud_saturation", "Armor saturation")); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeVoretCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY)); diff --git a/data/qcsrc/menu/voret/dialog_settings_video.c b/data/qcsrc/menu/voret/dialog_settings_video.c index 8a32214e..dbba1315 100644 --- a/data/qcsrc/menu/voret/dialog_settings_video.c +++ b/data/qcsrc/menu/voret/dialog_settings_video.c @@ -88,11 +88,6 @@ void fillVoretVideoSettingsTab(entity me) me.TR(me); me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Contrast boost:")); me.TD(me, 1, 2, e = makeVoretSlider(1.0, 5.0, 0.1, "v_contrastboost")); - me.TR(me); - me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Saturation:")); - setDependent(e, "vid_gl20", 1, 1); - me.TD(me, 1, 2, e = makeVoretSlider(0.5, 2.0, 0.05, "r_glsl_saturation")); - setDependent(e, "vid_gl20", 1, 1); me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeVoretCheckBox(0, "v_glslgamma", "Use GLSL to handle color control")); -- 2.39.2