From 6887205655ad341a560290af75baeac8689247b2 Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 16 Dec 2009 16:04:18 +0000 Subject: [PATCH] r_glsl to vid_gl20 cvar rename (please test) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8397 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/menu/nexuiz/dialog_settings_effects.c | 12 ++++++------ data/qcsrc/menu/nexuiz/dialog_settings_video.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c index afac52451..3c7855583 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c @@ -115,23 +115,23 @@ void fillNexuizEffectsSettingsTab(entity me) me.gotoRC(me, 2, 3.5); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 2, e = makeNexuizCheckBox(1, "mod_q3bsp_nolightmaps", "Use lightmaps")); me.TD(me, 1, 1.9, e = makeNexuizCheckBox(0, "r_glsl_deluxemapping", "Deluxe mapping")); - setDependentAND(e, "r_glsl", 1, 1, "mod_q3bsp_nolightmaps", 0, 0); + setDependentAND(e, "vid_gl20", 1, 1, "mod_q3bsp_nolightmaps", 0, 0); me.TD(me, 1, 0.7, e = makeNexuizCheckBox(0, "r_shadow_gloss", "Gloss")); - setDependentAND3(e, "r_glsl", 1, 1, "r_glsl_deluxemapping", 1, 2, "mod_q3bsp_nolightmaps", 0, 0); + setDependentAND3(e, "vid_gl20", 1, 1, "r_glsl_deluxemapping", 1, 2, "mod_q3bsp_nolightmaps", 0, 0); me.TR(me); me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping", "Offset mapping")); - setDependent(e, "r_glsl", 1, 1); + setDependent(e, "vid_gl20", 1, 1); me.TD(me, 1, 1.9, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping_reliefmapping", "Relief mapping")); - setDependentAND(e, "r_glsl", 1, 1, "r_glsl_offsetmapping", 1, 1); + setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1); me.TR(me); me.TD(me, 1, 1, e = makeNexuizCheckBox(0, "r_water", "Reflections:")); - setDependent(e, "r_glsl", 1, 1); + setDependent(e, "vid_gl20", 1, 1); me.TD(me, 1, 2, e = makeNexuizTextSlider("r_water_resolutionmultiplier")); e.addValue(e, "Blurred", "0.25"); e.addValue(e, "Good", "0.5"); e.addValue(e, "Sharp", "1"); e.configureNexuizTextSliderValues(e); - setDependentAND(e, "r_glsl", 1, 1, "r_water", 1, 1); + setDependentAND(e, "vid_gl20", 1, 1, "r_water", 1, 1); me.TR(me); if(cvar("developer")) me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(3, 0, "r_showsurfaces", "Show surfaces")); diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_video.c b/data/qcsrc/menu/nexuiz/dialog_settings_video.c index 89b084b17..fa9330f01 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_video.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_video.c @@ -51,7 +51,7 @@ void fillNexuizVideoSettingsTab(entity me) me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "vid_vsync", "Vertical Synchronization")); me.TR(me); me.TR(me); - me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_glsl", "Use OpenGL 2.0 shaders (GLSL)")); + me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "vid_gl20", "Use OpenGL 2.0 shaders (GLSL)")); me.TR(me); me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "r_coronas_occlusionquery", "Use Occlusion Queries")); me.TR(me); @@ -92,12 +92,12 @@ void fillNexuizVideoSettingsTab(entity me) me.TD(me, 1, 2, e = makeNexuizSlider(1.0, 5.0, 0.1, "v_contrastboost")); me.TR(me); me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Saturation:")); - setDependent(e, "r_glsl", 1, 1); + setDependent(e, "vid_gl20", 1, 1); me.TD(me, 1, 2, e = makeNexuizSlider(0.5, 2.0, 0.05, "r_glsl_saturation")); - setDependent(e, "r_glsl", 1, 1); + setDependent(e, "vid_gl20", 1, 1); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_glslgamma", "Use GLSL to handle color control")); - setDependent(e, "r_glsl", 1, 1); + setDependent(e, "vid_gl20", 1, 1); me.TR(me); me.TR(me); me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Ambient:")); -- 2.39.2