X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fmenu%2Fvoret%2Fdialog_settings_effects.c;h=19c2be7df38467788bceb5ac15bba4bd0f1c4c47;hp=449887a5d44988607e3bdde009e6ef0d0d705b9b;hb=27f209865bfd5bbe84d4d0aff5118b2830c336c8;hpb=cc148bf19700d380a18d7f51a706f9bbe959811b

diff --git a/data/qcsrc/menu/voret/dialog_settings_effects.c b/data/qcsrc/menu/voret/dialog_settings_effects.c
index 449887a5..19c2be7d 100644
--- a/data/qcsrc/menu/voret/dialog_settings_effects.c
+++ b/data/qcsrc/menu/voret/dialog_settings_effects.c
@@ -3,7 +3,7 @@ CLASS(VoretEffectsSettingsTab) EXTENDS(VoretTab)
 	METHOD(VoretEffectsSettingsTab, fill, void(entity))
 	ATTRIB(VoretEffectsSettingsTab, title, string, "Effects")
 	ATTRIB(VoretEffectsSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(VoretEffectsSettingsTab, rows, float, 17)
+	ATTRIB(VoretEffectsSettingsTab, rows, float, 20)
 	ATTRIB(VoretEffectsSettingsTab, columns, float, 6.5)
 ENDCLASS(VoretEffectsSettingsTab)
 entity makeVoretEffectsSettingsTab();
@@ -133,8 +133,6 @@ void fillVoretEffectsSettingsTab(entity me)
 			e.configureVoretTextSliderValues(e);
 			setDependentAND(e, "vid_gl20", 1, 1, "r_water", 1, 1);
 	me.TR(me);
-		if(cvar("developer"))
-			me.TD(me, 1, 3, e = makeVoretCheckBoxEx(3, 0, "r_showsurfaces", "Show surfaces"));
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeVoretRadioButton(1, string_null, string_null, "No dynamic lighting"));
 	me.TR(me);
@@ -155,11 +153,21 @@ void fillVoretEffectsSettingsTab(entity me)
 			setDependentWeird(e, someShadowCvarIsEnabled);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_coronas", "Coronas"));
+	me.TDempty(me, 0.2);
+		me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_coronas_occlusionquery", "Use Occlusion Queries"));
+			setDependent(e, "r_coronas", 1, 1);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_bloom", "Bloom"));
 			setDependent(e, "r_hdr", 0, 0);
 		me.TD(me, 1, 2, e = makeVoretCheckBox(0, "r_hdr", "High Dynamic Range (HDR)"));
-	
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Intensity:"));
+		me.TD(me, 1, 2, e = makeVoretSlider(2, 4, 0.1, "r_bloom_brighten"));
+		setDependentOR(e, "r_bloom", 1, 1, "r_hdr", 1, 1);
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeVoretCheckBox(0, "r_hdr_irisadaptation", "Iris adaptation"));
+	me.TR(me);
 	me.TR(me);
 		s = makeVoretSlider(0.1, 1, 0.1, "r_motionblur");
 		me.TD(me, 1, 1, e = makeVoretSliderCheckBox(0, 1, s, "Motion blur:"));
@@ -167,12 +175,9 @@ void fillVoretEffectsSettingsTab(entity me)
 			e.savedValue = 0.5; // default
 		me.TD(me, 1, 2, s);
 	me.TR(me);
-		s = makeVoretSlider(0.1, 1, 0.1, "r_damageblur");
-		me.TD(me, 1, 1, e = makeVoretSliderCheckBox(0, 1, s, "Damage blur:"));
-		if(s.value != e.savedValue)
-			e.savedValue = 0.4; // default
-		me.TD(me, 1, 2, s);
-	
+		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_powerup", "Powerup sharpen"));
+
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, makeVoretCommandButton("Apply immediately", '0 0 0', "vid_restart", COMMANDBUTTON_APPLY));
 }