planer: ore options for copper mine moved to config

Author: dalerank

src/building/building.cpp

@@ -1103,11 +1103,11 @@ int building_impl::static_params::planer_update_building_variant(build_planner &
 
 int building_impl::static_params::planer_construction_update(build_planner &planer, tile2i start, tile2i end) const {
     int special_flags = planer.special_flags;
-    if (special_flags & PlannerFlags::Meadow || special_flags & PlannerFlags::Rock
-        || special_flags & PlannerFlags::Trees || special_flags & PlannerFlags::NearbyWater
-        || special_flags & PlannerFlags::Walls || special_flags & PlannerFlags::Groundwater
-        || special_flags & PlannerFlags::Water || special_flags & PlannerFlags::ShoreLine
-        || special_flags & PlannerFlags::Road || special_flags & PlannerFlags::Intersection) {
+    if (special_flags & e_building_flag::Meadow || special_flags & e_building_flag::Rock
+        || special_flags & e_building_flag::Trees || special_flags & e_building_flag::NearbyWater
+        || special_flags & e_building_flag::Walls || special_flags & e_building_flag::Groundwater
+        || special_flags & e_building_flag::Water || special_flags & e_building_flag::ShoreLine
+        || special_flags & e_building_flag::Road || special_flags & e_building_flag::Intersection) {
         return 0;
     }
 
@@ -1206,11 +1206,11 @@ void building_impl::static_params::planer_ghost_preview(build_planner &planer, p
     planer.draw_tile_graphics_array(ctx, tile, end, pixel);
 }
 
-bool building_impl::static_params::planer_is_need_flag(PlannerFlags flag) const {
+bool building_impl::static_params::planer_is_need_flag(e_building_flags flag) const {
     switch (flag) {
-    case PlannerFlags::Meadow: return needs.meadow;
-    case PlannerFlags::Rock: return needs.rock;
-    case PlannerFlags::Ore: return needs.ore;
+    case e_building_flag::Meadow: return needs.meadow;
+    case e_building_flag::Rock: return needs.rock;
+    case e_building_flag::Ore: return needs.ore;
     }
 
     return false;

src/building/building.h

@@ -87,6 +87,7 @@ struct mouse;
 class build_planner;
 
 constexpr uint32_t MAX_BUILDINGS = 4000;
+using e_building_flags = uint32_t;
 
 enum e_labor_state {
     LABOR_STATE_NONE,
@@ -561,7 +562,7 @@ class building_impl {
         virtual int planer_construction_update(build_planner &p, tile2i start, tile2i end) const;
         virtual int planer_construction_place(build_planner &p, tile2i tile, tile2i end, int orientation, int variant) const;
         virtual void planer_ghost_preview(build_planner &p, painter &ctx, tile2i tile, tile2i end, vec2i pixel) const;
-        virtual bool planer_is_need_flag(PlannerFlags flag) const;
+        virtual bool planer_is_need_flag(e_building_flags flag) const;
         virtual bool is_unique_building() const { return unique_building; }
     };
 

src/building/building_raw_material.cpp

@@ -26,11 +26,12 @@
 #include "figure/figure.h"
 #include "js/js_game.h"
 #include "graphics/animation.h"
+#include "construction/build_planner.h"
 
+building_mine_copper::static_params copper_mine_m;
 buildings::model_t<building_clay_pit> clay_pit_m;
 buildings::model_t<building_mine_gold> gold_mine_m;
 buildings::model_t<building_mine_gems> gems_mine_m;
-buildings::model_t<building_mine_copper> copper_mine_m;
 buildings::model_t<building_reed_gatherer> gatherer_m;
 
 void building_mine::on_create(int orientation) {
@@ -64,6 +65,16 @@ void building_mine_gold::update_count() const {
     building_increase_industry_count(RESOURCE_GOLD, num_workers() > 0);
 }
 
+
+bool building_mine_copper::static_params::planer_is_need_flag(e_building_flags flag) const {
+    switch (flag) {
+    case e_building_flag::Ore:
+        return !config_get(CONFIG_GP_CH_COPPER_NEAR_MOUNTAINS) && needs.ore;
+    }
+
+    return building_industry::static_params::planer_is_need_flag(flag);
+}
+
 void building_mine_copper::update_count() const {
     building_increase_industry_count(RESOURCE_COPPER, num_workers() > 0);
 }

src/building/building_raw_material.h

@@ -63,8 +63,12 @@ class building_mine_gems : public building_mine {
 class building_mine_copper : public building_mine {
 public:
     BUILDING_METAINFO(BUILDING_COPPER_MINE, building_mine_copper)
-
     building_mine_copper(building &b) : building_mine(b) {}
+
+    struct static_params : public buildings::model_t<building_mine_copper> {
+        virtual bool planer_is_need_flag(e_building_flags flag) const override;
+    };
+
     virtual int get_produce_uptick_per_day() const override { return base.num_workers > 0 ? std::max<int>(1, base.num_workers / 2) : 0; }
     virtual void update_count() const override;
 };