diff --git a/docs/controls.md b/docs/controls.md index cb33dad1..5ba8c2d4 100644 --- a/docs/controls.md +++ b/docs/controls.md @@ -205,7 +205,7 @@ On game 1.4.3, while one of the game's menus has its focus box (the frame the d- ### Left click on the map -On game 1.4.3, while the Purah Pad's map is open (found as above; the Scope is not the map), the left mouse button presses A at the map's cursor instead of the button it is bound to (Y by default). A press is A or the binding from the moment the button goes down until it is released, so a button held as the map opens or closes keeps what it pressed (`poll_merged` in `runtime/input.c`). `map_click = 0` (`TOTK_MAP_CLICK=0`, live; the *Left click on the map* row of the Controls tab) leaves the left button on its binding there. The map is found only while `menu_cursor` is on. +With `map_click = 1` (off by default, so each key presses one controller button as everywhere else), on game 1.4.3, while the Purah Pad's map is open (found as above; the Scope is not the map), the left mouse button presses A at the map's cursor instead of the button it is bound to (Y by default). A press is A or the binding from the moment the button goes down until it is released, so a button held as the map opens or closes keeps what it pressed (`poll_merged` in `runtime/input.c`). `map_click = 1` (`TOTK_MAP_CLICK=1`, live; the *Left click on the map* row of the Controls tab) turns it on and `0`, the default, leaves the left button on its binding there. The map is found only while `menu_cursor` is on. ## Nintendo Switch 2 controllers diff --git a/runtime/cfg.c b/runtime/cfg.c index 06878bcc..684d85ed 100644 --- a/runtime/cfg.c +++ b/runtime/cfg.c @@ -156,7 +156,7 @@ static const CfgMeta metas[] = { {"LSTICK_DEADZONE", "", "0..50", LIVE}, {"RSTICK_DEADZONE", "", "0..50", LIVE}, {"MOUSE_MODE", "direct", "stick|direct", LIVE}, {"MOUSE_SENS", "1", "0..10", LIVE}, {"MOUSE_AIM_SCALE", "1", "0.1..3", LIVE}, {"MENU_CURSOR", "1", "0|1", LIVE}, - {"MAP_CLICK", "1", "0|1", LIVE}, // input.c: the left mouse button is A on the Purah Pad's map + {"MAP_CLICK", "0", "0|1", LIVE}, // input.c: the left mouse button is A on the Purah Pad's map {"WALK_KEY", "none", NULL, LIVE}, {"WALK_SCALE", "0.51", "0.2..0.9", LIVE}, {"MENU_LANG", "", "en|ru|pt-BR|zh-Hans", LIVE}, {"AMIIBO_DIR", "", NULL, LIVE}, diff --git a/runtime/menu_cursor.c b/runtime/menu_cursor.c index 25bd0afc..749d3f57 100644 --- a/runtime/menu_cursor.c +++ b/runtime/menu_cursor.c @@ -21,8 +21,8 @@ // Only while keyboard and mouse are the device used last (input_kbm_last): a gamepad player sees the menus unchanged. // TOTK_MENU_CURSOR (live, default 1): 0 leaves the menus to the keys and the pad. // -// On the map input.c makes the left mouse button A (menu_cursor_map; TOTK_MAP_CLICK, live, default 1), so a click -// acts at the map's cursor. The map is found only while TOTK_MENU_CURSOR is on. +// With TOTK_MAP_CLICK=1 (live, default 0: one key per controller button) input.c makes the left mouse button A on the +// map (menu_cursor_map), so a click acts at the map's cursor. The map is found only while TOTK_MENU_CURSOR is on. #include #include #include diff --git a/totk.ini.example b/totk.ini.example index 1aca43cf..049f476d 100644 --- a/totk.ini.example +++ b/totk.ini.example @@ -348,10 +348,10 @@ # right click is B. On the map the mouse moves the map's cursor and the scroll wheel zooms. 0 leaves the menus and # the map to the keys and the pad. Changes while the game runs. # menu_cursor = 1 -# The left mouse button on the Purah Pad's map, 1.4.3 only: it presses A at the map's cursor instead of the button it -# is bound to (Y by default). Needs menu_cursor = 1, which finds the map. 0 leaves the left button on its binding -# there. Changes while the game runs. -# map_click = 1 +# The left mouse button on the Purah Pad's map, 1.4.3 only. 1: it presses A at the map's cursor instead of the button +# it is bound to (Y by default). Needs menu_cursor = 1, which finds the map. 0 (the default) leaves the left button on +# its binding there, one key per controller button. Changes while the game runs. +# map_click = 0 # Mouse camera sensitivity (0 to 10; 0 = no mouse camera and no cursor capture). With mouse_mode = direct, 1 turns the # camera 0.08 degrees per count, the same in every camera mode (about 14.3 cm a turn at 800 DPI). # mouse_sens = 1