build_planner: function ghost_mark_deleting moved to class

Author: dalerank

src/building/construction/build_planner.cpp

@@ -131,6 +131,24 @@ void build_planner::add_building_tiles_from_list(int building_id, bool graphics_
     }
 }
 
+bool build_planner::ghost_mark_deleting(tile2i tile) {
+    if (!config_get(CONFIG_UI_VISUAL_FEEDBACK_ON_DELETE)) {
+        return false;
+    }
+
+    int construction_type = build_type;
+    if (!tile.grid_offset() || draw_as_constructing || construction_type != BUILDING_CLEAR_LAND) {
+        return (construction_type == BUILDING_CLEAR_LAND);
+    }
+
+    if (!in_progress) {
+        map_property_clear_constructing_and_deleted();
+    }
+
+    map_building_tiles_mark_deleting(tile.grid_offset());
+    return true;
+}
+
 static building* add_temple_complex_element(int x, int y, int orientation, building* prev) {
     building* b = building_create(prev->type, tile2i(x, y), orientation);
     game_undo_add_building(b);

src/building/construction/build_planner.h

@@ -141,6 +141,7 @@ class build_planner {
     static int is_blocked_for_building(tile2i tile, int size, blocked_tile_vec &blocked_tiles);
     static void draw_bridge(map_point tile, vec2i pixel, int type, painter &ctx);
     static void draw_partially_blocked(painter &ctx, int fully_blocked, const blocked_tile_vec &blocked_tiles);
+    bool ghost_mark_deleting(tile2i tile);
 };
 
 void build_planner_latch_on_venue(e_building_type type, building *b, int dx, int dy, int orientation, bool main_venue = false);

src/widget/city/building_ghost.cpp

@@ -113,22 +113,4 @@ static void get_building_base_xy(int map_x, int map_y, int building_size, int* x
     default:
         *x = *y = 0;
     }
-}
-
-bool city_building_ghost_mark_deleting(tile2i tile) {
-    if (!config_get(CONFIG_UI_VISUAL_FEEDBACK_ON_DELETE)) {
-        return false;
-    }
-
-    int construction_type = g_city_planner.build_type;
-    if (!tile.grid_offset() || g_city_planner.draw_as_constructing || construction_type != BUILDING_CLEAR_LAND) {
-        return (construction_type == BUILDING_CLEAR_LAND);
-    }
-
-    if (!g_city_planner.in_progress) {
-        map_property_clear_constructing_and_deleted();
-    }
-
-    map_building_tiles_mark_deleting(tile.grid_offset());
-    return true;
 }

src/widget/city/building_ghost.h

@@ -6,7 +6,4 @@
 #include "core/vec2i.h"
 #include "core/svector.h"
 
-struct painter;
 
-
-bool city_building_ghost_mark_deleting(tile2i tile);

src/widget/widget_city.cpp

@@ -176,7 +176,7 @@ void widget_city_draw_without_overlay(painter &ctx, int selected_figure_id, vec2
 
     init_draw_context(selected_figure_id, figure_coord, highlighted_formation);
 
-    city_building_ghost_mark_deleting(tile);
+    g_city_planner.ghost_mark_deleting(tile);
 
     map_render_clear();
 
@@ -207,7 +207,7 @@ void widget_city_draw_with_overlay(painter &ctx, tile2i tile) {
 
     map_render_clear();
 
-    city_building_ghost_mark_deleting(tile);
+    g_city_planner.ghost_mark_deleting(tile);
     city_view_foreach_valid_map_tile(ctx, update_tile_coords);
 
     map_figure_sort_by_y();