From 6299518e271958d87ed36e90f345195515d9e942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jianxiang=20Wang=20=28=E7=8E=8B=E5=81=A5=E7=BF=94=29?= Date: Wed, 12 Jun 2024 10:18:01 +0100 Subject: [PATCH 1/3] Fix mouse overmap navigation while using an isometric non-overmap tileset --- src/sdltiles.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp index d7ef15cd70905..629cd9c4eb0da 100644 --- a/src/sdltiles.cpp +++ b/src/sdltiles.cpp @@ -3968,10 +3968,11 @@ std::optional input_context::get_coordinates( const catacurses::window } const point screen_pos = coordinate - win_min; + const bool use_isometric = g->w_overmap ? false : g->is_tileset_isometric(); const point_bub_ms p = cata_tiles::screen_to_player( screen_pos, dim.scaled_font_size, win_size, - point_bub_ms( offset ), g->is_tileset_isometric() ); + point_bub_ms( offset ), use_isometric ); return tripoint( p.raw(), get_map().get_abs_sub().z() ); } From 587d453a37461a08e1c266f5d80ac7cee5563569 Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:55:13 +0100 Subject: [PATCH 2/3] Update src/sdltiles.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jianxiang Wang (王健翔) --- src/sdltiles.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp index 629cd9c4eb0da..a7482f7f45689 100644 --- a/src/sdltiles.cpp +++ b/src/sdltiles.cpp @@ -3968,7 +3968,7 @@ std::optional input_context::get_coordinates( const catacurses::window } const point screen_pos = coordinate - win_min; - const bool use_isometric = g->w_overmap ? false : g->is_tileset_isometric(); + const bool use_isometric = g->w_overmap && capture_win == g->w_overmap ? false : g->is_tileset_isometric(); const point_bub_ms p = cata_tiles::screen_to_player( screen_pos, dim.scaled_font_size, win_size, From 7ca462d7254e706e0c5d68ba603882b3b303debb Mon Sep 17 00:00:00 2001 From: Procyonae <45432782+Procyonae@users.noreply.github.com> Date: Wed, 12 Jun 2024 14:40:20 +0100 Subject: [PATCH 3/3] Update src/sdltiles.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/sdltiles.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp index a7482f7f45689..c452baf562e98 100644 --- a/src/sdltiles.cpp +++ b/src/sdltiles.cpp @@ -3968,7 +3968,8 @@ std::optional input_context::get_coordinates( const catacurses::window } const point screen_pos = coordinate - win_min; - const bool use_isometric = g->w_overmap && capture_win == g->w_overmap ? false : g->is_tileset_isometric(); + const bool use_isometric = g->w_overmap && + capture_win == g->w_overmap ? false : g->is_tileset_isometric(); const point_bub_ms p = cata_tiles::screen_to_player( screen_pos, dim.scaled_font_size, win_size,