From 76f9f2dc6bca294d2a926cb5343cddfb8b746d5e Mon Sep 17 00:00:00 2001
From: flowtron <flowtron@users.sourceforge.net>
Date: Thu, 30 Oct 2008 23:11:26 +0000
Subject: [PATCH] new mouse- & scopesens handling in menus

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3349 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/defaults.cfg       |  9 +++++++-
 config/menus_settings.cfg | 44 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/config/defaults.cfg b/config/defaults.cfg
index 49aa6fbe..f8aa0567 100644
--- a/config/defaults.cfg
+++ b/config/defaults.cfg
@@ -13,7 +13,14 @@ lighterror 4 //set higher (for example 8) if you experience slowdown
 // if you want to set your own value for it, go to the following line and 
 // replace (div $sensitivity 2) by your desired sensitivity value:
 
-alias scopesens [div $sensitivity 2]
+//alias scopesens [div $sensitivity 2]
+alias scopesensdiv 3
+alias scopesensmul 2
+//alias scopesens [
+//	echo (concatword $scopesensmul "/" $scopesensdiv "=" (* (div $sensitivity $scopesensdiv) $scopesensmul))
+//	result (* (div $sensitivity $scopesensdiv) $scopesensmul)
+//]
+alias scopesens [ result (* (div $sensitivity $scopesensdiv) $scopesensmul) ]
 
 //bind MOUSE2 [ zoom 1; onrelease [ zoom 0 ] ]
 
diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg
index c856eaa0..4493c389 100644
--- a/config/menus_settings.cfg
+++ b/config/menus_settings.cfg
@@ -42,12 +42,51 @@ newmenu "QUICK setup"
 menuitemtextinput "Nickname:				" 		"" "name $arg1"
 menuitemtextinput "Resolution (Width):			" "$scr_w" "scr_w $arg1"
 menuitemtextinput "Resolution (Height):			" "$scr_h" "scr_h $arg1"
-menuitemslider "Mouse sensitivity: " 2 150 "($sensitivity)" 2 "" "sensitivity $arg1"
+menuitem "Mouse Sensitivity"                "openmousemenu"
 menuitemslider "Graphics detail: " 1 4 "(getgfxq)" 1 [Low Medium Good "Best (but slow)"] "new_gfx_quality $arg1"
 menuitemslider "Sound detail: " 1 3 "(getsoundq)" 1 "Low Medium High" "new_sound_quality $arg1"
 menuitem "" -1
 menuitem "2			  [ OK ]" "resetgl"
 
+openmousemenu = [
+	alias mousesensmenus "10 100"
+	alias msmx (findlist $mousesensmenus $sensitivityscale)
+	if (= $msmx -1) [showmenu "mouse sensitivity odd"] [showmenu (concat mouse sensitivity $sensitivityscale)]
+]
+
+closemousemenu = [
+	closemenu "mouse sensitivity 10"
+	closemenu "mouse sensitivity 100"
+	closemenu "mouse sensitivity odd"
+]
+
+//closemousemenu = [closemenu (concat mouse sensitivity $sensitivityscale)]
+togglemousemenu = [
+	closemousemenu
+	openmousemenu
+]
+
+newmenu "mouse sensitivity odd"
+menuitemtextinput "MouseSens: " "($sensitivity)" [sensitivity $arg1;togglemousemenu] 
+menuitemtextinput "SensScale: " "($sensitivityscale)" [sensitivityscale $arg1;togglemousemenu] 
+menuitemtextinput "ZoomSens MULby: " "($scopesensmul)" [alias scopesensmul $arg1;togglemousemenu] 
+menuitemtextinput "ZoomSens DIVby: " "($scopesensdiv)" [alias scopesensdiv $arg1;togglemousemenu] 
+menuitemtextinput "ZoomSens Value: " "(scopesens)" [echo "read only - use the input-fields for MUL and DIV"]
+
+newmenu "mouse sensitivity 10"
+menuitemslider "Mouse sensitivity: " 2 150 "($sensitivity)" 2 "" "sensitivity $arg1"
+menuitemslider "Mouse sensscale: " 10 100 "($sensitivityscale)" 90 "" [sensitivityscale $arg1;if (= $sensitivityscale 10) [sensitivity 30] [sensitivity 300];togglemousemenu]
+menuitemslider "ZoomSens MULby: " 1 6 "($scopesensmul)" 1 "" [alias scopesensmul $arg1;togglemousemenu] 
+menuitemslider "ZoomSens DIVby: " 1 6 "($scopesensdiv)" 1 "" [alias scopesensdiv $arg1;togglemousemenu] 
+menuitemtextinput "ZoomSens Value: " "(scopesens)" [echo "read only - use the sliders"]
+
+newmenu "mouse sensitivity 100"
+menuitemslider "Mouse sensitivity: " 20 1500 "($sensitivity)" 5 "" "sensitivity $arg1"
+menuitemslider "Mouse sensscale: " 10 100 "($sensitivityscale)" 90 "" [sensitivityscale $arg1;if (= $sensitivityscale 10) [sensitivity 30] [sensitivity 300];togglemousemenu]
+menuitemslider "ZoomSens MULby: " 1 6 "($scopesensmul)" 1 "" [alias scopesensmul $arg1;togglemousemenu] 
+menuitemslider "ZoomSens DIVby: " 1 6 "($scopesensdiv)" 1 "" [alias scopesensdiv $arg1;togglemousemenu] 
+menuitemtextinput "ZoomSens Value: " "(scopesens)" [echo "read only - use the sliders"]
+
 alias getgfxq [
     if (= $minlod 200) [ result 4 ] [
         if (= $minlod 100) [ result 3 ] [
@@ -198,7 +237,8 @@ menuitemkeyinput "Map overview: "   toggleshowmap
 menuitemkeyinput "Drop CTF flag: "  dropflag
 menuitem "" -1
 menuitemcheckbox "Invert mouse: " "$invmouse" "invmouse $arg1"
-menuitemslider "Mouse sensitivity: " 3 150 "($sensitivity)" 3 "" "sensitivity $arg1"
+//menuitemslider "Mouse sensitivity: " 3 150 "($sensitivity)" 3 "" "sensitivity $arg1"
+menuitem "Mouse sensitivity"        "openmousemenu"
 menuitem "" -1
 menuitem "Reset keybinds to default settings..." [ showmenu "Reset Binds" ]