diff --git a/iw4x/iw4x_00/ui_mp/pc_options_actions.menu b/iw4x/iw4x_00/ui_mp/pc_options_actions.menu index 4391f16..7b10210 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_actions.menu +++ b/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