diff --git a/src/economy/economy_production.cpp b/src/economy/economy_production.cpp index 927ba546c..5d49a4eed 100644 --- a/src/economy/economy_production.cpp +++ b/src/economy/economy_production.cpp @@ -141,7 +141,7 @@ inline constexpr float free_efficiency = 0.3f; template auto max_rgo_efficiency(sys::state& state, NATIONS n, PROV p, dcon::commodity_id c) { using VALUE = adaptive_ve::convert_to_float; - using MASK = adaptive_ve::convert_to_bool; + //using MASK = adaptive_ve::convert_to_bool; auto is_mine = state.world.commodity_get_is_mine(c); diff --git a/src/gui/factory_details.cpp b/src/gui/factory_details.cpp index 225a87c9a..c1394d84d 100644 --- a/src/gui/factory_details.cpp +++ b/src/gui/factory_details.cpp @@ -418,7 +418,7 @@ void factory_details_main_inputs_row_t::update(sys::state& state, layout_window factory_details_main_t& main = *((factory_details_main_t*)(parent)); // BEGIN main::inputs_row::update values.clear(); - for(int i = 0; i < economy::commodity_set::set_size; i++) { + for(uint32_t i = 0; i < economy::commodity_set::set_size; i++) { auto& value = main.last_explanation.primary_inputs; if (!value.commodity_type[i]) break; add_commodity_row(value.commodity_type[i], value.commodity_actual_amount[i], value.efficient_ratio[i], value.commodity_price[i]); diff --git a/src/map/map.cpp b/src/map/map.cpp index 17f6a79d7..c54548af0 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -2869,7 +2869,7 @@ void display_data::update_sprawl(sys::state& state) { //N = 5; //} - square::tangent start { settlement.first / size, { 0.f, 1.f } }; + square::tangent start { { settlement.first / size }, { 0.f, 1.f } }; int N = 10; for(int layer = 0; layer >= ((center == 0 && is_capital) ? -1 : 0); layer--) {