Update ControllerInputs (#224)

This commit is contained in:
Arthur authored and GitHub committed 2026-04-27 15:43:28 +02:00
1 parent 29953b1bda
commit 75c0896bb6
2 files changed
+72 -29

No files matched your search

+41 -2
View File
@@ -272,7 +272,7 @@ enum class ControllerInputs : uint32_t
INPUT_MP_TEXT_CHAT_TEAM,
INPUT_MP_TEXT_CHAT_FRIENDS,
INPUT_MP_TEXT_CHAT_CREW,
INPUT_PUSH_TO_TALK,
INPUT_PC_PUSH_TO_TALK,
INPUT_CREATOR_LS,
INPUT_CREATOR_RS,
INPUT_CREATOR_LT,
@@ -280,6 +280,43 @@ enum class ControllerInputs : uint32_t
INPUT_CREATOR_MENU_TOGGLE,
INPUT_CREATOR_ACCEPT,
INPUT_CREATOR_DELETE,
INPUT_CREATOR_SWITCH_CAMERA,
INPUT_CREATOR_TOGGLE_ORBIT_CAMERA,
INPUT_CREATOR_CAMERA_DECREASE,
INPUT_CREATOR_CAMERA_INCREASE,
INPUT_CREATOR_MENU_ACCEPT,
INPUT_CREATOR_MENU_CANCEL,
INPUT_CREATOR_FAST_ADJUST,
INPUT_CREATOR_FINE_ADJUST,
INPUT_CREATOR_FAST_ZOOM,
INPUT_CREATOR_LIST,
INPUT_CREATOR_ALT_MENU_ENTRY,
INPUT_CREATOR_WARP_AND_EDIT,
INPUT_CREATOR_TAB_LEFT,
INPUT_CREATOR_TAB_RIGHT,
INPUT_CREATOR_ROTATE_LEFT,
INPUT_CREATOR_ROTATE_RIGHT,
INPUT_CREATOR_FOV_INCREASE,
INPUT_CREATOR_FOV_DECREASE,
INPUT_CREATOR_EXTRA_OPTIONS1,
INPUT_CREATOR_EXTRA_OPTIONS2,
INPUT_CREATOR_CONTEXT_MENU,
INPUT_CREATOR_MENU_UP,
INPUT_CREATOR_MENU_DOWN,
INPUT_CREATOR_ADJUST_LEFT,
INPUT_CREATOR_ADJUST_RIGHT,
INPUT_CREATOR_RESET_FOV,
INPUT_CREATOR_ENTITY_RAISE,
INPUT_CREATOR_ENTITY_LOWER,
INPUT_CREATOR_TOGGLE_DESCRIPTIONS,
INPUT_CREATOR_MENU,
INPUT_CREATOR_MENU_DELETE,
INPUT_CREATOR_MOVE_LR,
INPUT_CREATOR_MOVE_UD,
INPUT_CREATOR_MOVE_UP_ONLY,
INPUT_CREATOR_MOVE_DOWN_ONLY,
INPUT_CREATOR_MOVE_LEFT_ONLY,
INPUT_CREATOR_MOVE_RIGHT_ONLY,
INPUT_ATTACK2,
INPUT_RAPPEL_JUMP,
INPUT_RAPPEL_LONG_JUMP,
@@ -357,7 +394,7 @@ enum class ControllerInputs : uint32_t
INPUT_VEH_FLY_ATTACK2,
INPUT_RADIO_WHEEL_UD,
INPUT_RADIO_WHEEL_LR,
INPUT_VEH_SLOWMO_UD,
INPUT_VEH_SLOWMO_UP,
INPUT_VEH_SLOWMO_UP_ONLY,
INPUT_VEH_SLOWMO_DOWN_ONLY,
INPUT_VEH_HYDRAULICS_CONTROL_TOGGLE,
@@ -381,6 +418,8 @@ enum class ControllerInputs : uint32_t
INPUT_VEH_FLY_BOMB_BAY,
INPUT_VEH_FLY_COUNTER,
INPUT_VEH_TRANSFORM,
INPUT_VEH_SHIFT_GEAR_UP,
INPUT_VEH_SHIFT_GEAR_DOWN,
MAX_INPUTS,
UNDEFINED_INPUT,
DYNAMIC_MAPPING_MOUSE_X,
+31 -27
View File
@@ -219,33 +219,37 @@ namespace big
{
if (g_gui->m_is_open || g_gui->m_override_mouse)
{
for (uint8_t i = 0; i <= 6; i++)
PAD::DISABLE_CONTROL_ACTION(2, i, true);
PAD::DISABLE_CONTROL_ACTION(2, 106, true);
PAD::DISABLE_CONTROL_ACTION(2, 329, true);
PAD::DISABLE_CONTROL_ACTION(2, 330, true);
PAD::DISABLE_CONTROL_ACTION(2, 14, true);
PAD::DISABLE_CONTROL_ACTION(2, 15, true);
PAD::DISABLE_CONTROL_ACTION(2, 16, true);
PAD::DISABLE_CONTROL_ACTION(2, 17, true);
PAD::DISABLE_CONTROL_ACTION(2, 24, true);
PAD::DISABLE_CONTROL_ACTION(2, 69, true);
PAD::DISABLE_CONTROL_ACTION(2, 70, true);
PAD::DISABLE_CONTROL_ACTION(2, 84, true);
PAD::DISABLE_CONTROL_ACTION(2, 85, true);
PAD::DISABLE_CONTROL_ACTION(2, 99, true);
PAD::DISABLE_CONTROL_ACTION(2, 92, true);
PAD::DISABLE_CONTROL_ACTION(2, 100, true);
PAD::DISABLE_CONTROL_ACTION(2, 114, true);
PAD::DISABLE_CONTROL_ACTION(2, 115, true);
PAD::DISABLE_CONTROL_ACTION(2, 121, true);
PAD::DISABLE_CONTROL_ACTION(2, 142, true);
PAD::DISABLE_CONTROL_ACTION(2, 241, true);
PAD::DISABLE_CONTROL_ACTION(2, 261, true);
PAD::DISABLE_CONTROL_ACTION(2, 257, true);
PAD::DISABLE_CONTROL_ACTION(2, 262, true);
PAD::DISABLE_CONTROL_ACTION(2, 331, true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_NEXT_CAMERA), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_LOOK_LR), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_LOOK_UD), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_LOOK_UP_ONLY), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_LOOK_DOWN_ONLY), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_LOOK_LEFT_ONLY), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_LOOK_RIGHT_ONLY), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_WEAPON_WHEEL_NEXT), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_WEAPON_WHEEL_PREV), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_SELECT_NEXT_WEAPON), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_SELECT_PREV_WEAPON), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_ATTACK), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_ATTACK), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_ATTACK2), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_PREV_RADIO_TRACK), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_RADIO_WHEEL), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_PASSENGER_ATTACK), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_SELECT_NEXT_WEAPON), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_SELECT_PREV_WEAPON), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_MOUSE_CONTROL_OVERRIDE), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_FLY_ATTACK), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_FLY_SELECT_NEXT_WEAPON), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_FLY_ATTACK_CAMERA), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_MELEE_ATTACK_ALTERNATE), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_CURSOR_SCROLL_UP), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_ATTACK2), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_PREV_WEAPON), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_NEXT_WEAPON), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_DRIVE_LOOK), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_DRIVE_LOOK2), true);
PAD::DISABLE_CONTROL_ACTION(2, static_cast<int>(ControllerInputs::INPUT_VEH_FLY_ATTACK2), true);
}
}