From a49ea317d1653b69432833840e11ff5d4fc77a1c Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 20 Dec 2014 17:22:21 +1100 Subject: [PATCH] Remove cl_cubemaps_extra --- defaultXonotic.cfg | 2 -- effects-high.cfg | 1 - effects-low.cfg | 1 - effects-med.cfg | 1 - effects-normal.cfg | 1 - effects-omg.cfg | 1 - effects-ultimate.cfg | 1 - effects-ultra.cfg | 1 - qcsrc/menu/xonotic/dialog_settings_effects.c | 2 -- 9 files changed, 11 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 2939ddf98..7984a29d6 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1224,8 +1224,6 @@ volume 1 // sucks less than the old one cl_decals_newsystem 1 -seta cl_cubemaps_extra 1 - set sv_q3acompat_machineshotgunswap 0 "shorthand for swapping machinegun and shotgun (for Q3A map compatibility in mapinfo files)" set g_movement_highspeed 1 "movement speed modification factor (only changes movement when above maxspeed)" diff --git a/effects-high.cfg b/effects-high.cfg index e8b15b429..a514ce5cb 100644 --- a/effects-high.cfg +++ b/effects-high.cfg @@ -6,7 +6,6 @@ cl_particles_quality 1.0 cl_damageeffect 1 cl_spawn_point_particles 1 cl_playerdetailreduction 4.0 -cl_cubemaps_extra 1 gl_flashblend 0 gl_picmip -1 mod_q3bsp_nolightmaps 0 diff --git a/effects-low.cfg b/effects-low.cfg index d079d5fc4..b7e9a98a3 100644 --- a/effects-low.cfg +++ b/effects-low.cfg @@ -6,7 +6,6 @@ cl_particles_quality 0.4 cl_damageeffect 0 cl_spawn_point_particles 0 cl_playerdetailreduction 4 -cl_cubemaps_extra 0 gl_flashblend 1 gl_picmip 1 mod_q3bsp_nolightmaps 1 diff --git a/effects-med.cfg b/effects-med.cfg index 84df44948..66eed5aa5 100644 --- a/effects-med.cfg +++ b/effects-med.cfg @@ -6,7 +6,6 @@ cl_particles_quality 0.8 cl_damageeffect 0 cl_spawn_point_particles 0 cl_playerdetailreduction 4 -cl_cubemaps_extra 0 gl_flashblend 0 gl_picmip 0 mod_q3bsp_nolightmaps 0 diff --git a/effects-normal.cfg b/effects-normal.cfg index 27756437e..63dcd134a 100644 --- a/effects-normal.cfg +++ b/effects-normal.cfg @@ -6,7 +6,6 @@ cl_particles_quality 1.0 cl_damageeffect 1 cl_spawn_point_particles 1 cl_playerdetailreduction 4 -cl_cubemaps_extra 0 gl_flashblend 0 gl_picmip 0 mod_q3bsp_nolightmaps 0 diff --git a/effects-omg.cfg b/effects-omg.cfg index 79f2b6f17..9018ee2c9 100644 --- a/effects-omg.cfg +++ b/effects-omg.cfg @@ -6,7 +6,6 @@ cl_particles_quality 0.4 cl_damageeffect 0 cl_spawn_point_particles 0 cl_playerdetailreduction 4 -cl_cubemaps_extra 0 gl_flashblend 1 gl_picmip 1337 mod_q3bsp_nolightmaps 1 diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg index bbe0fcc61..0cf3a899c 100644 --- a/effects-ultimate.cfg +++ b/effects-ultimate.cfg @@ -6,7 +6,6 @@ cl_particles_quality 1.0 cl_damageeffect 2 cl_spawn_point_particles 1 cl_playerdetailreduction 0 -cl_cubemaps_extra 1 gl_flashblend 0 gl_picmip -1 mod_q3bsp_nolightmaps 0 diff --git a/effects-ultra.cfg b/effects-ultra.cfg index 249a13447..5909f3b83 100644 --- a/effects-ultra.cfg +++ b/effects-ultra.cfg @@ -6,7 +6,6 @@ cl_particles_quality 1.0 cl_damageeffect 2 cl_spawn_point_particles 1 cl_playerdetailreduction 0 -cl_cubemaps_extra 1 gl_flashblend 0 gl_picmip -1 mod_q3bsp_nolightmaps 0 diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c index 0fccda074..59b4860af 100644 --- a/qcsrc/menu/xonotic/dialog_settings_effects.c +++ b/qcsrc/menu/xonotic/dialog_settings_effects.c @@ -129,8 +129,6 @@ void XonoticEffectsSettingsTab_fill(entity me) e.addValue(e, _("Sharp"), "1"); e.configureXonoticTextSliderValues(e); setDependentAND(e, "vid_gl20", 1, 1, "r_water", 1, 1); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "cl_cubemaps_extra", _("Extra reflective effects"))); me.TR(me); me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "cl_decals", _("Decals"))); me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "cl_decals_models", _("Decals on models"))); -- 2.39.2