Disable extra cubemaps in medium and normal configs, add cl_cubemaps_extra to the...

diff --git a/effects-med.cfg b/effects-med.cfg
index 75f7250bd95b34d5fbf70aebba7ba81d7cc407c5..84df44948e2e4b602f96c4db88e07c60fefb1b3f 100644 (file)
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -6,7 +6,7 @@ cl_particles_quality 0.8
 cl_damageeffect 0
 cl_spawn_point_particles 0
 cl_playerdetailreduction 4
-cl_cubemaps_extra 1
+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 b1a967509e7e0b41d0bfc699fcbad2e85bbbd982..27756437effdb9292acc2b070a844a6f6deea0f5 100644 (file)
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -6,7 +6,7 @@ cl_particles_quality 1.0
 cl_damageeffect 1
 cl_spawn_point_particles 1
 cl_playerdetailreduction 4
-cl_cubemaps_extra 1
+cl_cubemaps_extra 0
 gl_flashblend 0
 gl_picmip 0
 mod_q3bsp_nolightmaps 0

diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc
index 742dd118525e959a3252575ce3278102e1597e4a..479756d42939a9e08dc67e9aa9b1cb403e5a4b2e 100644 (file)
--- a/qcsrc/common/playerstats.qc
+++ b/qcsrc/common/playerstats.qc
@@ -769,7 +769,7 @@ void PlayerStats_PlayerDetail_Handler(entity fh, entity unused, float status)
                                        
                                        default:
                                        {
-                                               print(sprintf(
+                                               printf(
                                                        "PlayerStats_PlayerDetail_Handler(): ERROR: "
                                                        "Key went unhandled? Is our version outdated?\n"
                                                        "PlayerStats_PlayerDetail_Handler(): "
@@ -777,7 +777,7 @@ void PlayerStats_PlayerDetail_Handler(entity fh, entity unused, float status)
                                                        key,
                                                        event,
                                                        data
-                                               ));
+                                               );
                                                break;
                                        }
                                }

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 949f0cce6c647b9b17fa8d0176827ee290cf9a12..3a69a2eee5aa47e2b8ee8d82c7b3dd76f3820162 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -179,6 +179,8 @@ void XonoticEffectsSettingsTab_fill(entity me)
                me.TDempty(me, 0.2);
                me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "r_coronas_occlusionquery", _("Fade corona according to visibility")));
                        setDependent(e, "r_coronas", 1, 1);
+       me.TR(me);
+               me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "cl_cubemaps_extra", _("Extra reflective effects")));
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_bloom", _("Bloom")));
                me.TD(me, 1, 2, e = makeXonoticCheckBoxEx(0.5, 0, "hud_postprocessing_maxbluralpha", _("Extra postprocessing effects")));