From 733a5d51d0fe5d4a963392b3e9d2302e80301025 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 6 Jan 2020 21:52:48 +1000 Subject: [PATCH] Remove crosshair_hittest_showimpact from the menu and add a notice to its cvar that it's glitchy --- crosshairs.cfg | 4 ++-- qcsrc/menu/xonotic/dialog_settings_game_view.qc | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/crosshairs.cfg b/crosshairs.cfg index 47631f0fa..ae3fec080 100644 --- a/crosshairs.cfg +++ b/crosshairs.cfg @@ -32,10 +32,10 @@ seta crosshair_hitindication_speed 5 // hit testing/tracing for special effects for the crosshair set g_trueaim_minrange 44 "TrueAim minimum range (TrueAim adjusts shots so they hit the crosshair point even though the gun is not at the screen center)" -seta crosshair_hittest 1 "do a crosshair hit evaluation, applying effects from the _blur, _scale, and _showipact cvars" +seta crosshair_hittest 1 "do a crosshair hit evaluation, applying effects from the _blur and _scale cvars" seta crosshair_hittest_blur 1 "blur the crosshair if the shot is obstructed" seta crosshair_hittest_scale 1.25 "shrink crosshair if shot is obstructed or aiming at a teammate" -seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact location if obstructed" +seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact location if obstructed (debug setting, very glitchy!)" // change color based on special case seta crosshair_color_special 1 "special color handling for crosshair... 1 = per-weapon crosshair color (see crosshair_per_weapon), 2 = crosshair changes color based on health, 3 = rainbow/random color selection" diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qc b/qcsrc/menu/xonotic/dialog_settings_game_view.qc index 0b3a9ff6c..ed21eeae0 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_view.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qc @@ -24,7 +24,6 @@ void XonoticGameViewSettingsTab_fill(entity me) me.TR(me); me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "chase_active", "0", _("1st person perspective"))); - makeMulti(e, "crosshair_hittest_showimpact"); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_eventchase_death", _("Slide to third person upon death"))); @@ -49,7 +48,6 @@ void XonoticGameViewSettingsTab_fill(entity me) me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "chase_active", "1", _("3rd person perspective"))); - makeMulti(e, "crosshair_hittest_showimpact"); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Back distance"))); -- 2.39.2