From 4d4a6de5ad518d55dcfaab096f861b54e9d71b73 Mon Sep 17 00:00:00 2001
From: Mario <zacjardine@y7mail.com>
Date: Mon, 15 Dec 2014 10:01:16 +1100
Subject: [PATCH] Disable extra cubemaps in medium and normal configs, add
 cl_cubemaps_extra to the menu

---
 effects-med.cfg                              | 2 +-
 effects-normal.cfg                           | 2 +-
 qcsrc/common/playerstats.qc                  | 4 ++--
 qcsrc/menu/xonotic/dialog_settings_effects.c | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/effects-med.cfg b/effects-med.cfg
index 75f7250bd..84df44948 100644
--- 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 b1a967509..27756437e 100644
--- 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 742dd1185..479756d42 100644
--- 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 949f0cce6..3a69a2eee 100644
--- 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")));
-- 
2.39.2