From 7b565582f6daa03ff488798013ac720cc47b8a07 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Wed, 4 Dec 2024 16:09:50 +0100 Subject: small improvements, close #48 --- src/scenes/world_map.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/scenes') diff --git a/src/scenes/world_map.c b/src/scenes/world_map.c index 3ef4cdb..792f5d0 100644 --- a/src/scenes/world_map.c +++ b/src/scenes/world_map.c @@ -27,6 +27,7 @@ void place_detail_show_schedule_with_highlighted_job(world_location* loc, schedu void world_map_set_active_world(world* world) { + scene_state = WORLD_SCENE_STATE_IDLE; _active_world = world; } @@ -1227,22 +1228,24 @@ static void world_map_draw_menu(platform_window* window) if (button_render(scale, BUTTON_ENABLED, "Save", panel_x + pad_x, vertical_pad + panel_y + pad_y*2 + button_h*1, button_w, button_h)) { game_set_active_scene(GAME_STATE_SELECT_SAVE); - scene_state = WORLD_SCENE_STATE_IDLE; + //scene_state = WORLD_SCENE_STATE_IDLE; is_selecting_save_location = true; } if (button_render(scale, BUTTON_ENABLED, "Settings", panel_x + pad_x, vertical_pad + panel_y + pad_y*3 + button_h*2, button_w, button_h)) { game_set_active_scene(GAME_STATE_SETTINGS); - scene_state = WORLD_SCENE_STATE_IDLE; + //scene_state = WORLD_SCENE_STATE_IDLE; is_editing_settings_from_ingame = true; } if (button_render(scale, BUTTON_ENABLED, "Quit", panel_x + pad_x, vertical_pad + panel_y + pad_y*4 + button_h*3, button_w, button_h)) { game_set_active_scene(GAME_STATE_MENU); - scene_state = WORLD_SCENE_STATE_IDLE; + //scene_state = WORLD_SCENE_STATE_IDLE; } + + is_left_clicked(); } void world_map_scene_render(platform_window* window) @@ -1283,7 +1286,7 @@ void world_map_scene_render(platform_window* window) if (currently_viewing_active_job.offerid != INVALID_ID) world_map_draw_viewing_job(window); if (_active_world) { - world_update_result click_result = world_render(window, _active_world); + world_update_result click_result = world_render(window, _active_world, scene_state == WORLD_SCENE_STATE_IDLE); if (click_result.clicked_location) { if (click_result.clicked_location->is_owned) { -- cgit v1.2.3-70-g09d2