From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 9 May 2011 19:45:29 +0000 (+0200)
Subject: default menu_mouse_absolute to 1
X-Git-Tag: xonotic-v0.5.0~263^2~14
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=037e96a10fec24ef3fd78241c72b386488acd81c;p=xonotic%2Fxonotic-data.pk3dir.git

default menu_mouse_absolute to 1
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index f03a88bb0..73d5d6352 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1595,7 +1595,7 @@ gl_texturecompression_lightcubemaps 1
 gl_texturecompression_q3bsplightmaps 0
 gl_texturecompression_sky 1
 
-set menu_mouse_absolute 0	"TODO make this seta if the engine understands this right"
+seta menu_mouse_absolute 1 "use the OS mouse pointer motion for menu"
 seta menu_mouse_speed 1 "speed multiplier for the mouse in the menu (does not affect in-game aiming)"
 set menu_use_default_hostname 1
 alias sethostname "set menu_use_default_hostname 0; hostname $*"
diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c
index ee244931d..617b4e95f 100644
--- a/qcsrc/menu/xonotic/dialog_settings_input.c
+++ b/qcsrc/menu/xonotic/dialog_settings_input.c
@@ -46,8 +46,11 @@ void XonoticInputSettingsTab_fill(entity me)
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Sensitivity:")));
 		me.TD(me, 1, 2, e = makeXonoticSlider(1, 32, 0.2, "sensitivity"));
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("UI mouse speed:")));
-		me.TD(me, 1, 2, e = makeXonoticSlider(0.2, 4.0, 0.1, "menu_mouse_speed"));
+		if(cvar("menu_mouse_absolute") == 0) // TODO remove this entirely later
+		{
+			me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("UI mouse speed:")));
+			me.TD(me, 1, 2, e = makeXonoticSlider(0.2, 4.0, 0.1, "menu_mouse_speed"));
+		}
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "m_filter", _("Mouse filter")));
 	me.TR(me);