Merge pull request #20 from XLabsProject/develop

Swap action controls menu bind fields to better suit gamepad controll…

iw4x/iw4x_00/default_mp_controller.cfg

@@ -4,6 +4,7 @@
 // Virtual axis are : VA_SIDE, VA_FORWARD, VA_UP, VA_YAW, VA_PITCH, VA_ATTACK
 //==========================================================================================
 
+set gpad_enabled 1
 set gpad_sticksConfig "thumbstick_default"
 set gpad_buttonsConfig "buttons_default"
 

iw4x/iw4x_00/ui_mp/pc_options_actions.menu

@@ -40,6 +40,9 @@
 #define ON_MENU_ESC \
 	close											self;
 
+#define ON_GPAD_USED when(dvarBool("gpad_in_use") == 1)
+#define ON_GPAD_UNUSED when(dvarBool("gpad_in_use") == 0)
+
 menuDef
 {
 	name											MENU_NAME
@@ -65,10 +68,11 @@ menuDef
 	PC_OPTIONS_KEYBINDING(2, "@MENU_HOLD_AIM_DOWN_SIGHT", "+speed_throw")
 	PC_OPTIONS_KEYBINDING(3, "@MENU_LEAN_LEFT", "+leanleft")
 	PC_OPTIONS_KEYBINDING(4, "@MENU_LEAN_RIGHT", "+leanright")
-	PC_OPTIONS_KEYBINDING(5, "@MENU_RELOAD_WEAPON", "+reload")
+	PC_OPTIONS_KEYBINDING_RAW(5, "@MENU_USE_RELOAD", "+usereload", ON_GPAD_USED)
+	PC_OPTIONS_KEYBINDING_RAW(5, "@MENU_RELOAD_WEAPON", "+reload", ON_GPAD_UNUSED)
 	PC_OPTIONS_KEYBINDING(6, "@MENU_SWITCH_WEAPON", "weapnext")
 	PC_OPTIONS_KEYBINDING(7, "@MENU_MELEE_ATTACK", "+melee")
-	PC_OPTIONS_KEYBINDING(8, "@MENU_USE", "+activate")
+	PC_OPTIONS_KEYBINDING_RAW(8, "@MENU_USE", "+activate", ON_GPAD_UNUSED)
 	PC_OPTIONS_KEYBINDING(9, "@MENU_FRAG_EQUIPMENT", "+frag")
 	PC_OPTIONS_KEYBINDING(10, "@MENU_THROW_SPECIAL_GRENADE", "+smoke")
 	PC_OPTIONS_KEYBINDING(11, "@MENU_WEAPON_ATTACHMENT", "+actionslot 3")
@@ -78,7 +82,8 @@ menuDef
 
 	PC_OPTIONS_SEPERATOR(14)
 
-	PC_OPTIONS_KEYBINDING(15, "@MENU_SHOW_OBJECTIVES_SCORES", "+scores")
+	PC_OPTIONS_KEYBINDING_RAW(15, "@MENU_SHOW_OBJECTIVES_SCORES", "togglescores", ON_GPAD_USED)
+	PC_OPTIONS_KEYBINDING_RAW(15, "@MENU_SHOW_OBJECTIVES_SCORES", "+scores", ON_GPAD_UNUSED)
 
 	PC_OPTIONS_KEYBINDSTATUS
 

iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu

@@ -102,7 +102,7 @@ menuDef
 	PC_OPTIONS_SECTION_TITLE(MENU_TITLE)
 
 	PC_OPTIONS_DVARYESNO_RAW(0, "@MENU_GAMEPAD_ENABLED", "gpad_enabled", ON_GAMEPAD_ENABLED_TOGGLE;, "@MPUI_DESC_GAMEPAD_ENABLED", when(0), 1)
-	PC_OPTIONS_SEPERATOR(0)
+	PC_OPTIONS_SEPERATOR_VIS(0, ON_GPAD_ENABLED)
 
 	PC_OPTIONS_DVARYESNO_RAW(1, "@MENU_LOOK_INVERSION", "input_invertPitch", ;, "@MPUI_DESC_LOOK_INVERSION", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_STRLIST_RAW(2, "@MENU_THUMBSTICK_LAYOUT", "gpad_sticksConfig", 
@@ -122,7 +122,7 @@ menuDef
 	PC_OPTIONS_FLOATLIST_RAW(4, "@MENU_GPAD_STYLE", "gpad_style", {"@MENU_GPAD_XBOX_CAPS" 0 "@MENU_GPAD_PS_CAPS" 1}, ;, "@MPUI_DESC_GPAD_STYLE", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_LOCKON_ENABLED", "gpad_lockon_enabled", ;, "@MPUI_DESC_LOCKON_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
-	PC_OPTIONS_SEPERATOR(6)
+	PC_OPTIONS_SEPERATOR_VIS(6, ON_GPAD_ENABLED)
 	PC_OPTIONS_DVARSLIDER_RAW(7, "@MENU_LOOK_SENSITIVITY", "input_viewSensitivity", 0.5, 4, 1.0, ;, ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_FLOATLIST_RAW(8, "@MENU_LOOK_SENSITIVITY_PRESET", "input_viewSensitivity", 
 		{"@MENU_SENSITIVITY_LOW_CAPS" SENSITIVITY_1 "@MENU_SENSITIVITY_MEDIUM_CAPS" SENSITIVITY_2 "3" SENSITIVITY_3

iw4x/iw4x_00/ui_mp/pc_options_look.menu

@@ -74,7 +74,7 @@ menuDef
 		exp											text(dvarString("sensitivity"))
 	}
 
-	PC_OPTIONS_DVARSLIDER(0, "@MENU_MOUSE_SENSITIVITY", "sensitivity", 0.01, 100, 5, ;, ;, ;, when(0))
+	PC_OPTIONS_DVARSLIDER(0, "@MENU_MOUSE_SENSITIVITY", "sensitivity", 0.1, 10, 5, ;, ;, ;, when(0))
 	PC_OPTIONS_DVARYESNO(1, "@MENU_INVERT_MOUSE", "ui_mousePitch", uiscript updateui_mousePitch;, when(0))
 
 	PC_OPTIONS_SEPERATOR(1)
@@ -89,4 +89,4 @@ menuDef
 	PC_OPTIONS_KEYBINDSTATUS
 
 	ITEM_BUTTON_BACK(ON_MENU_ESC)
-}
+}