From 887ce323430b9ddd0940cefad1012f342c203630 Mon Sep 17 00:00:00 2001 From: Valiantsin Dzerakh Date: Thu, 12 Nov 2026 18:29:24 +0300 Subject: [PATCH] Open the wheel's weapon bar only where the camera hooks saw free roam, a lock-on or a mount An unclassified camera is also a paused menu, a 1.2.1 menu or any screen menu_cursor.c does not read; opening the bar there held D-pad right and moved the right stick inside that menu. Co-Authored-By: Claude Opus 5.5 --- runtime/gameplay_tweaks.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/gameplay_tweaks.c b/runtime/gameplay_tweaks.c index 4df1147f..500f4919 100644 --- a/runtime/gameplay_tweaks.c +++ b/runtime/gameplay_tweaks.c @@ -118,8 +118,10 @@ static int weapon_wheel_allowed(uint64_t buttons, int right_down, int already_ac int ctx = input_camera_context(); if (!already_active) { - if (ctx != INPUT_CAM_UNCLASSIFIED && ctx != INPUT_CAM_FREE_ROAM && - ctx != INPUT_CAM_LOCK_ON && ctx != INPUT_CAM_VEHICLE) + // Opening needs a camera the mouse_direct hooks saw this moment: an unclassified one is also a paused menu, + // 1.2.1's menus or any screen menu_cursor.c does not read, where D-pad right and the right stick would move + // the menu instead. + if (ctx != INPUT_CAM_FREE_ROAM && ctx != INPUT_CAM_LOCK_ON && ctx != INPUT_CAM_VEHICLE) return 0; } else { if (ctx != INPUT_CAM_UNCLASSIFIED && ctx != INPUT_CAM_MENU_WHEEL &&