planer: moved setup_preview_graphics() logic to building params class

Author: dalerank

src/building/building.cpp

@@ -24,6 +24,7 @@
 #include "grid/random.h"
 #include "grid/image.h"
 #include "grid/routing/routing_terrain.h"
+#include "construction/build_planner.h"
 #include "grid/floodplain.h"
 #include "grid/terrain.h"
 #include "grid/tiles.h"
@@ -1098,6 +1099,12 @@ void building_impl::static_params::load(archive arch) {
 }
 
 void building_impl::static_params::setup_preview_graphics(build_planner &planer) const {
+    int img_id = anim[animkeys().base].first_img();
+    if (!img_id) {
+        img_id = anim[animkeys().preview].first_img();
+    }
+    img_id += planer_relative_orientation * planer.relative_orientation;
+    planer.set_tiles_building(img_id, building_size);
 }
 
 io_buffer* iob_building_highest_id = new io_buffer([](io_buffer* iob, size_t version) {

src/building/construction/build_planner.cpp

@@ -311,7 +311,7 @@ static int has_nearby_enemy(int x_start, int y_start, int x_end, int y_end) {
     return 0;
 }
 
-static int place_houses(bool measure_only, int x_start, int y_start, int x_end, int y_end) {
+int build_planner::place_houses(bool measure_only, int x_start, int y_start, int x_end, int y_end) {
     grid_area area = map_grid_get_area(tile2i(x_start, y_start), tile2i(x_end, y_end));
 
     int needs_road_warning = 0;
@@ -548,6 +548,7 @@ void build_planner::set_tiles_building(int image_id, int size_xx) {
             set_graphics_row(row, empty_row, size.x);
     }
 }
+
 void build_planner::set_graphics_array(int* image_set, int size_x, int size_y) {
     init_tiles(size_x, size_y);
     // int (*image_array)[size_y][size_x] = (int(*)[size_y][size_x])image_set;
@@ -748,7 +749,7 @@ void build_planner::setup_build_flags() {
 }
 
 void build_planner::setup_build_graphics() {
-    const auto &props = building_impl::params(build_type);
+    const auto &params = building_impl::params(build_type);
 
     vec2i init_tiles_size;
     switch (build_type) {
@@ -883,13 +884,13 @@ void build_planner::setup_build_graphics() {
         break;
 
     case BUILDING_WATER_LIFT:
-        set_tiles_building(props.anim[animkeys().base].first_img() + relative_orientation + variant * 4, props.building_size);
+        set_tiles_building(params.anim[animkeys().base].first_img() + relative_orientation + variant * 4, params.building_size);
         break;
 
     case BUILDING_DOCK:
     case BUILDING_WARSHIP_WHARF:
     case BUILDING_TRANSPORT_WHARF:
-        set_tiles_building(props.anim[animkeys().base].first_img() + relative_orientation, props.building_size);
+        set_tiles_building(params.anim[animkeys().base].first_img() + relative_orientation, props.building_size);
         break;
 
     case BUILDING_LOW_BRIDGE:
@@ -946,17 +947,7 @@ void build_planner::setup_build_graphics() {
         break;
 
     default: // regular buildings 
-        {
-            const auto &params = building_impl::params(build_type);
-            params.setup_preview_graphics(*this);
-
-            int img_id = props.anim[animkeys().base].first_img();
-            if (!img_id) {
-                img_id = params.anim[animkeys().preview].first_img();
-            }
-            img_id += params.planer_relative_orientation * relative_orientation;
-            set_tiles_building(img_id, props.building_size);
-        }
+        params.setup_preview_graphics(*this);
         break;
     }
 }

src/building/construction/build_planner.h

@@ -69,7 +69,6 @@ class build_planner {
 
     void init_tiles(int size_x, int size_y);
     void set_graphics_row(int row, int* image_ids, int total);
-    void set_tiles_building(int image_id, int size_xx);
     void set_graphics_array(int* image_set, int size_x, int size_y);
 
     void setup_build_flags();
@@ -92,6 +91,7 @@ class build_planner {
     bool map_is_straight_road_for_canal(int grid_offset);
     bool is_road_tile_for_canal(int grid_offset, int gate_orientation);
     void draw_entertainment_venue(tile2i tile, vec2i pixel, e_building_type type, painter &ctx);
+    int place_houses(bool measure_only, int x_start, int y_start, int x_end, int y_end);
 
 public:
     e_building_type build_type;
@@ -134,6 +134,7 @@ class build_planner {
     void draw(painter &ctx);
     bool place();
 
+    void set_tiles_building(int image_id, int size_xx);
     static int is_blocked_for_farm(tile2i tile, int size, blocked_tile_vec &blocked_tiles);
     static void draw_building_ghost(painter &ctx, int image_id, vec2i pixel, color color_mask = COLOR_MASK_GREEN);
     static void draw_flat_tile(painter &ctx, vec2i pixel, color color_mask);