The free camera combo also switches from the keys bound to its buttons and from an input script.

freecam_gate read the combo from the physical gamepad only, so a tester's input script that pressed ZL+ZR+L3
sent it to the game instead (#1213). Each position of the combo now also counts when the Switch buttons it stands
for are down in the merged buttons, as the Minus+Plus menu combo already does; Home has no Switch button and stays
gamepad only.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
lebomisandClaude Opus 5.5 committed 2026-11-19 13:32:23 +11:00
1 parent 88f9a965af
commit 8dfc3609c4
2 files changed
+19 -11

No files matched your search

+3 -2
View File
@@ -133,8 +133,9 @@ bind_Y = pad:north, key:mouse_l
On game 1.4.3, a chosen gamepad combo or a key activates or deactivates the free camera. Neither is set by default: pick
them with `freecam_pad` and `freecam_key` in `totk.ini` or on the Controls tab (for example ZL+ZR+L3, LT+RT+L3 on an
Xbox pad, and F6; `none` turns one off). The world goes on, but the game gets no input while the free camera is on, so
Link stands where he was.
Xbox pad, and F6; `none` turns one off). The combo's buttons also count when they come from the keys bound to them or
from an input script. The world goes on, but the game gets no input while the free camera is on, so Link stands where he
was.
| Gamepad | Keyboard and mouse (default bindings) | Free camera |
|---|---|---|
+16 -9
View File
@@ -849,19 +849,26 @@ static float trigger_unit(int16_t v) { // 0..1 past a 5 % dead zone
return t < 0.05f ? 0 : (t - 0.05f) / 0.95f;
}
// The free camera combo, latched like Minus+Plus (input_map.c, chord): once every button of it is down the free
// camera switches once, and the buttons stay hidden from the game until all are released; the free camera key
// switches it on its press. While the free camera is on it gets the input and the game gets nothing, so Link stands
// still: the sticks (the keys' sticks merged into sl and sr), the trigger axes or else ZL and ZR as buttons, a press of
// L or R as a speed click, and the mouse's motion, which input_direct_mouse_sample then keeps from the game's camera.
// ZL, ZR, L and R are the merged Switch buttons, so the keys bound to them count. Off for other updates and with the
// freecam patch set off. Under lock.
// The free camera combo, latched like Minus+Plus (input_map.c, chord): once every button of it is down (on the gamepad,
// or as the merged Switch buttons from bound keys or an input script) the free camera switches once, and the buttons
// stay hidden from the game until all are released; the free camera key switches it on its press. While the free camera
// is on it gets the input and the game gets nothing, so Link stands still: the sticks (the keys' sticks merged into sl
// and sr), the trigger axes or else ZL and ZR as buttons, a press of L or R as a speed click, and the mouse's motion,
// which input_direct_mouse_sample then keeps from the game's camera. ZL, ZR, L and R are the merged Switch buttons, so
// the keys bound to them count. Off for other updates and with the freecam patch set off. Under lock.
static void freecam_gate(uint64_t *b, int32_t sl[2], int32_t sr[2]) {
static int held, key_held, available = -1, shoulder[2];
if (available < 0) available = freecam_available();
uint32_t mask = available ? freecam_pad_mask() : 0, raw = 0;
for (int p = PAD_SOUTH; p <= PAD_GUIDE; p++)
if (mask >> p & 1 && pad_seen[p]) raw |= 1u << p;
int layout = pad_layout_get();
for (int p = PAD_SOUTH; p <= PAD_GUIDE; p++) {
if (!(mask >> p & 1)) continue;
// A position counts as down on the gamepad or through the Switch buttons it stands for in the merged buttons,
// so the keys bound to them and an input script press the combo too. Home has no Switch button: gamepad only.
uint8_t one[PAD_COUNT] = {0};
if (p < PAD_COUNT) one[p] = 1;
if (pad_seen[p] || (p < PAD_COUNT && *b & input_map_pad_buttons(one, layout))) raw |= 1u << p;
}
if (!mask) held = 0;
else if (held) held = raw != 0;
else if (raw == mask) {