routing: ferry now based from building_routeblock

Author: dalerank

src/building/building.cpp

@@ -276,6 +276,7 @@ building_storage *building::dcast_storage() { return dcast()->dcast_storage(); }
 building_temple *building::dcast_temple() { return dcast()->dcast_temple(); }
 building_tax_collector *building::dcast_tax_collector() { return dcast()->dcast_tax_collector(); }
 building_roadblock *building::dcast_roadblock() { return dcast()->dcast_roadblock(); }
+building_routeblock *building::dcast_routeblock() { return dcast()->dcast_routeblock(); }
 building_mine *building::dcast_mine() { return dcast()->dcast_mine(); }
 building_quarry *building::dcast_quarry() { return dcast()->dcast_quarry(); }
 building_palace *building::dcast_palace() { return dcast()->dcast_palace(); }

src/building/building.h

@@ -68,6 +68,7 @@ class building_quarry;
 class building_palace;
 class building_festival_square;
 class building_bandstand;
+class building_routeblock;
 struct tooltip_context;
 struct object_info;
 struct painter;
@@ -439,6 +440,7 @@ class building {
     building_temple *dcast_temple();
     building_tax_collector *dcast_tax_collector();
     building_roadblock *dcast_roadblock();
+    building_routeblock *dcast_routeblock();
     building_mine *dcast_mine();
     building_quarry *dcast_quarry();
     building_palace *dcast_palace();
@@ -568,6 +570,7 @@ class building_impl {
     virtual building_palace *dcast_palace() { return nullptr; }
     virtual building_festival_square *dcast_festival_square() { return nullptr; }
     virtual building_bandstand *dcast_bandstand() { return nullptr; }
+    virtual building_routeblock *dcast_routeblock() { return nullptr; }
 
     inline building_impl *next() { return base.next()->dcast(); }
     inline building_impl *main() { return base.main()->dcast(); }

src/building/building_ferry.h

@@ -1,21 +1,24 @@
 #pragma once
 
-#include "building/building.h"
+#include "building/building_roadblock.h"
 #include "window/window_building_info.h"
 
-class building_ferry : public building_impl {
+class building_ferry : public building_routeblock {
 public:
     BUILDING_METAINFO(BUILDING_FERRY, building_ferry)
 
-    building_ferry(building &b) : building_impl(b) {}
+        building_ferry(building &b) : building_routeblock(b) {}
     virtual building_ferry *dcast_ferry() override { return this; }
+    virtual building_routeblock *dcast_routeblock() override { return this; }
 
     virtual void on_create(int orientation) override;
     virtual void on_place_update_tiles(int orientation, int variant) override;
     virtual void update_map_orientation(int orientation) override;
     virtual bool force_draw_height_tile(painter &ctx, tile2i tile, vec2i pixel, color mask) override;
     virtual bool force_draw_top_tile(painter &ctx, tile2i tile, vec2i pixel, color mask) override;
     virtual void highlight_waypoints() override;
+
+    virtual bool get_permission(e_permission p) override { return false; }
 };
 
 struct info_window_ferry : public building_info_window_t<info_window_ferry> {

src/building/building_roadblock.cpp

@@ -9,11 +9,6 @@
 
 buildings::model_t<building_roadblock> roadblock_m;
 
-ANK_REGISTER_CONFIG_ITERATOR(config_load_building_roadblock);
-void config_load_building_roadblock() {
-    roadblock_m.load();
-}
-
 void building_roadblock::on_place_checks() {
     /*nothing*/
 }
@@ -24,11 +19,11 @@ bool building_roadblock::force_draw_flat_tile(painter &ctx, tile2i tile, vec2i p
 }
 
 void building_roadblock::set_permission(e_permission p) {
-    int permission_bit = 1 << p;
+    const int permission_bit = 1 << p;
     base.subtype.roadblock_exceptions ^= permission_bit;
 }
 
-int building_roadblock::get_permission(e_permission p) {
-    int permission_bit = 1 << p;
+bool building_roadblock::get_permission(e_permission p) {
+    const int permission_bit = 1 << p;
     return (base.subtype.roadblock_exceptions & permission_bit);
 }

src/building/building_roadblock.h

@@ -1,29 +1,29 @@
 #pragma once
 
 #include "building/building.h"
+#include "city/constants.h"
+
+class building_routeblock : public building_impl {
+public:
+    building_routeblock(building &b) : building_impl(b) {}
+
+    virtual building_routeblock *dcast_routeblock() override { return this; }
+
+    virtual void set_permission(e_permission) {}
+    virtual bool get_permission(e_permission) { return false; }
 
-enum e_permission {
-    epermission_none = 0,
-    epermission_maintenance = 1,
-    epermission_priest = 2,
-    epermission_market = 3,
-    epermission_entertainer = 4,
-    epermission_education = 5,
-    epermission_medicine = 6,
-    epermission_tax_collector = 7
 };
 
-class building_roadblock : public building_impl {
+class building_roadblock : public building_routeblock {
 public:
     BUILDING_METAINFO(BUILDING_ROADBLOCK, building_roadblock)
-    building_roadblock(building &b) : building_impl(b) {}
+    building_roadblock(building &b) : building_routeblock(b) {}
 
     virtual building_roadblock *dcast_roadblock() override { return this; }
 
     virtual void on_place_checks() override;
     virtual bool force_draw_flat_tile(painter &ctx, tile2i tile, vec2i pixel, color mask) override;
 
-    void set_permission(e_permission p);
-    int get_permission(e_permission p);
-
+    virtual void set_permission(e_permission p) override;
+    virtual bool get_permission(e_permission p) override;
 };

src/city/constants.h

@@ -49,4 +49,15 @@ enum e_availability {
     NOT_AVAILABLE_YET = -1,
     NOT_AVAILABLE = 0,
     AVAILABLE = 1,
+};
+
+enum e_permission {
+    epermission_none = 0,
+    epermission_maintenance = 1,
+    epermission_priest = 2,
+    epermission_market = 3,
+    epermission_entertainer = 4,
+    epermission_education = 5,
+    epermission_medicine = 6,
+    epermission_tax_collector = 7
 };

src/figure/figure.h

@@ -337,7 +337,7 @@ class figure {
     void advance_figure_tick();
     void set_target_height_bridge();
     void set_target_height_building();
-    int get_permission_for_figure();
+    e_permission get_permission_for_figure();
     void move_to_next_tile();
     void set_next_tile_and_direction();
     void advance_route_tile(int roaming_enabled);

src/figure/movement.cpp

@@ -80,7 +80,7 @@ void figure::set_target_height_building() {
     target_height = map_building_height_at(tile.grid_offset());
 }
 
-int figure::get_permission_for_figure() {
+e_permission figure::get_permission_for_figure() {
     switch (type) {
     case FIGURE_ARCHITECT:
     case FIGURE_FIREMAN:
@@ -469,7 +469,7 @@ int figure::roam_ticks(int num_ticks) {
 
             int came_from_direction = (previous_tile_direction + 4) % 8;
             int road_tiles[8];
-            int permission = get_permission_for_figure();
+            e_permission permission = get_permission_for_figure();
             int adjacent_road_tiles = map_get_adjacent_road_tiles_for_roaming(tile.grid_offset(), road_tiles, permission);
             if (adjacent_road_tiles == 3 && map_get_diagonal_road_tiles_for_roaming(tile.grid_offset(), road_tiles) >= 5) {
                 // go in the straight direction of a double-wide road

src/grid/road_access.cpp

@@ -431,7 +431,7 @@ static int terrain_is_road_like(int grid_offset) {
     return map_terrain_is(grid_offset, TERRAIN_ROAD | TERRAIN_ACCESS_RAMP) ? 1 : 0;
 }
 
-static bool is_adjacent_road_tile_for_roaming(int grid_offset, int perm) {
+static bool is_adjacent_road_tile_for_roaming(int grid_offset, e_permission perm) {
     if (map_terrain_is(grid_offset, TERRAIN_WATER) && map_terrain_is(grid_offset, TERRAIN_FLOODPLAIN)) {
         return 0;
     }
@@ -446,8 +446,8 @@ static bool is_adjacent_road_tile_for_roaming(int grid_offset, int perm) {
         return false;
     } 
 
-    building_roadblock *roadblock = b->dcast_roadblock();
-    if (roadblock && !roadblock->get_permission((e_permission)perm)) {
+    building_routeblock *roadblock = b->dcast_roadblock();
+    if (roadblock && !roadblock->get_permission(perm)) {
         return false;
     } 
 
@@ -476,7 +476,7 @@ static bool is_adjacent_road_tile_for_roaming(int grid_offset, int perm) {
     return is_road;
 }
 
-int map_get_adjacent_road_tiles_for_roaming(int grid_offset, int* road_tiles, int perm) {
+int map_get_adjacent_road_tiles_for_roaming(int grid_offset, int* road_tiles, e_permission perm) {
     road_tiles[1] = road_tiles[3] = road_tiles[5] = road_tiles[7] = 0;
 
     road_tiles[0] = is_adjacent_road_tile_for_roaming(grid_offset + GRID_OFFSET(0, -1), perm);

src/grid/road_access.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "grid/point.h"
+#include "city/constants.h"
 class building;
 
 bool map_has_road_access(tile2i tile, int size);
@@ -15,7 +16,7 @@ bool map_reachable_road_within_radius(tile2i tile, int size, int radius, tile2i
 tile2i map_road_to_largest_network_rotation(int rotation, tile2i tile, int size,  bool closest);
 tile2i map_road_to_largest_network(tile2i tile, int size, bool closest);
 int map_road_to_largest_network_hippodrome(int x, int y, int* x_road, int* y_road);
-int map_get_adjacent_road_tiles_for_roaming(int grid_offset, int* road_tiles, int p);
+int map_get_adjacent_road_tiles_for_roaming(int grid_offset, int* road_tiles, e_permission permission);
 int map_get_diagonal_road_tiles_for_roaming(int grid_offset, int* road_tiles);
 inline int map_get_diagonal_road_tiles_for_roaming(tile2i tile, int *road_tiles) { return map_get_diagonal_road_tiles_for_roaming(tile.grid_offset(), road_tiles); }
 int map_has_adjacent_road_tiles(int grid_offset);