Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes for the map window #198

Merged
merged 3 commits into from
Jan 23, 2024
Merged

Minor fixes for the map window #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
377c4e8
Cancel mark adding when destroying current map
lukehorvat Nov 13, 2022
e30f754
Cancel mark adding when clicking the small map
lukehorvat Nov 13, 2022
13faef4
On map change, reset the tab map to the current map
lukehorvat Nov 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ void destroy_map(void)
#ifdef CLUSTER_INSIDES
destroy_clusters_array ();
#endif

inspect_map_text = 0;
adding_mark = 0;
}

#ifndef MAP_EDITOR2
Expand Down
2 changes: 2 additions & 0 deletions mapwin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,13 @@ static int click_map_handler (window_info *win, int mx, int my, Uint32 flags)
if (hud_click(win, mx, my, flags))
return 1;

// Was the small map clicked?
if (left_click && mx > small_map_screen_x_left && mx < small_map_screen_x_right
&& my > small_map_screen_y_top && my < small_map_screen_y_bottom)
{
showing_continent = !showing_continent;
inspect_map_text = 0;
adding_mark = 0;
}
else if (!showing_continent && inspect_map_text == 0)
{
Expand Down