planer: map_terrain_add_in_area() function now using tile2i args instead raw values

Author: dalerank

src/building/construction/build_planner.cpp

@@ -1319,7 +1319,7 @@ void build_planner::construction_finalize() { // confirm final placement
     }
 
     if (special_flags & e_building_flag::Road) {
-        map_terrain_add_in_area(end.x(), end.y(), end.x() + size.x - 1, end.y() + size.y - 1, TERRAIN_ROAD);
+        map_terrain_add_in_area(end, end.shifted(size.x - 1, size.y - 1), TERRAIN_ROAD);
         map_tiles_update_area_roads(end.x(), end.y(), 5);
         map_tiles_update_all_plazas();
     }
@@ -1512,18 +1512,18 @@ bool build_planner::is_road_tile_for_canal(int grid_offset, int gate_orientation
 }
 
 bool build_planner::map_is_straight_road_for_canal(int grid_offset) {
-    int road_tiles_x = is_road_tile_for_canal(grid_offset + GRID_OFFSET(1, 0), 2)
-        + is_road_tile_for_canal(grid_offset + GRID_OFFSET(-1, 0), 2);
-    int road_tiles_y = is_road_tile_for_canal(grid_offset + GRID_OFFSET(0, -1), 1)
-        + is_road_tile_for_canal(grid_offset + GRID_OFFSET(0, 1), 1);
+    int road_tiles_x = is_road_tile_for_canal(grid_offset + GRID_OFFSET(1, 0), 2) + is_road_tile_for_canal(grid_offset + GRID_OFFSET(-1, 0), 2);
+    int road_tiles_y = is_road_tile_for_canal(grid_offset + GRID_OFFSET(0, -1), 1) + is_road_tile_for_canal(grid_offset + GRID_OFFSET(0, 1), 1);
 
-    if (road_tiles_x == 2 && road_tiles_y == 0)
+    if (road_tiles_x == 2 && road_tiles_y == 0) {
         return true;
-    else if (road_tiles_y == 2 && road_tiles_x == 0)
+    } 
+    
+    if (road_tiles_y == 2 && road_tiles_x == 0) {
         return true;
-    else {
-        return false;
     }
+    
+    return false;
 }
 
 void build_planner::draw_canal(map_point tile, vec2i pixel, painter &ctx) {

src/grid/terrain.cpp

@@ -43,13 +43,15 @@ void map_terrain_add(int grid_offset, int terrain) {
 void map_terrain_remove(int grid_offset, int terrain) {
     map_grid_and(g_terrain_grid, grid_offset, ~terrain);
 }
-void map_terrain_add_in_area(int x_min, int y_min, int x_max, int y_max, int terrain) {
-    for (int yy = y_min; yy <= y_max; yy++) {
-        for (int xx = x_min; xx <= x_max; xx++) {
-            map_terrain_add(MAP_OFFSET(xx, yy), terrain);
+
+void map_terrain_add_in_area(tile2i pmin, tile2i pmax, int terrain) {
+    for (int yy = pmin.y(); yy <= pmax.y(); yy++) {
+        for (int xx = pmin.x(); xx <= pmax.y(); xx++) {
+            map_terrain_add(tile2i(xx, yy), terrain);
         }
     }
 }
+
 void map_terrain_add_with_radius(tile2i tile, int size, int radius, int terrain) {
     grid_area area = map_grid_get_area(tile, size, radius);
 

src/grid/terrain.h

@@ -90,7 +90,7 @@ inline void map_terrain_add(tile2i tile, int terrain) { map_terrain_add(tile.gri
 
 void map_terrain_remove(int grid_offset, int terrain);
 
-void map_terrain_add_in_area(int x_min, int y_min, int x_max, int y_max, int terrain);
+void map_terrain_add_in_area(tile2i pmin, tile2i pmax, int terrain);
 
 void map_terrain_add_with_radius(tile2i tile, int size, int radius, int terrain);