From f1073d20e976c8d138f7d58f08e941ccefe261c7 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Mon, 22 Jan 2024 02:19:33 +0000 Subject: [PATCH] Fix various narrowing cast warnings --- src/linkgraph/linkgraph.h | 2 +- src/newgrf_config.cpp | 2 +- src/station_cmd.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/linkgraph/linkgraph.h b/src/linkgraph/linkgraph.h index 5cf677f194..d98fece3c5 100644 --- a/src/linkgraph/linkgraph.h +++ b/src/linkgraph/linkgraph.h @@ -365,7 +365,7 @@ public: */ inline uint Monthly(uint base) const { - return (static_cast(base) * 30 * DAY_TICKS * _settings_game.economy.day_length_factor) / std::max((_scaled_date_ticks - this->last_compression).base(), DAY_TICKS); + return (uint)((static_cast(base) * 30 * DAY_TICKS * _settings_game.economy.day_length_factor) / std::max((_scaled_date_ticks - this->last_compression).base(), DAY_TICKS)); } NodeID AddNode(const Station *st); diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp index 5b7fc4c7cf..25975ffa43 100644 --- a/src/newgrf_config.cpp +++ b/src/newgrf_config.cpp @@ -224,7 +224,7 @@ void GRFParameterInfo::SetValue(struct GRFConfig *config, uint32_t value) } else { SB(config->param[this->param_nr], this->first_bit, this->num_bit, value); } - config->num_params = std::max(config->num_params, this->param_nr + 1); + config->num_params = (uint8_t)std::max(config->num_params, this->param_nr + 1); SetWindowDirty(WC_GAME_OPTIONS, WN_GAME_OPTIONS_NEWGRF_STATE); } diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 99f74c593f..2e324ab0e8 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1281,8 +1281,8 @@ CommandCost CanExpandRailStation(const BaseStation *st, TileArea &new_ta) /* determine new size of train station region.. */ int x = std::min(TileX(cur_ta.tile), TileX(new_ta.tile)); int y = std::min(TileY(cur_ta.tile), TileY(new_ta.tile)); - new_ta.w = std::max(TileX(cur_ta.tile) + cur_ta.w, TileX(new_ta.tile) + new_ta.w) - x; - new_ta.h = std::max(TileY(cur_ta.tile) + cur_ta.h, TileY(new_ta.tile) + new_ta.h) - y; + new_ta.w = (uint16_t)std::max(TileX(cur_ta.tile) + cur_ta.w, TileX(new_ta.tile) + new_ta.w) - x; + new_ta.h = (uint16_t)std::max(TileY(cur_ta.tile) + cur_ta.h, TileY(new_ta.tile) + new_ta.h) - y; new_ta.tile = TileXY(x, y); /* make sure the final size is not too big. */