From 3712b84d2e3bd1306dd4a3656dbcf83ff9f57889 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 9 Apr 2024 18:45:37 +0100 Subject: [PATCH] Fix narrowing conversion warnings --- src/industry_cmd.cpp | 4 ++-- src/industry_gui.cpp | 4 ++-- src/sl/newsignals_sl.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 29fac7e269..d0a8db2378 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -1916,7 +1916,7 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, IndustryType type, /* Clear all input cargo types */ for (size_t j = 0; j < i->accepts_cargo.size(); j++) i->accepts_cargo[j] = INVALID_CARGO; /* Query actual types */ - uint maxcargoes = (indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED) ? std::size(i->accepts_cargo) : 3; + uint maxcargoes = (indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED) ? (uint)std::size(i->accepts_cargo) : 3; for (uint j = 0; j < maxcargoes; j++) { uint16_t res = GetIndustryCallback(CBID_INDUSTRY_INPUT_CARGO_TYPES, j, 0, i, type, INVALID_TILE); if (res == CALLBACK_FAILED || GB(res, 0, 8) == UINT8_MAX) break; @@ -1948,7 +1948,7 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, IndustryType type, /* Clear all output cargo types */ for (size_t j = 0; j < i->produced_cargo.size(); j++) i->produced_cargo[j] = INVALID_CARGO; /* Query actual types */ - uint maxcargoes = (indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED) ? std::size(i->produced_cargo) : 2; + uint maxcargoes = (indspec->behaviour & INDUSTRYBEH_CARGOTYPES_UNLIMITED) ? (uint)std::size(i->produced_cargo) : 2; for (uint j = 0; j < maxcargoes; j++) { uint16_t res = GetIndustryCallback(CBID_INDUSTRY_OUTPUT_CARGO_TYPES, j, 0, i, type, INVALID_TILE); if (res == CALLBACK_FAILED || GB(res, 0, 8) == UINT8_MAX) break; diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index dbe25e0cc1..4635b58feb 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -1486,9 +1486,9 @@ protected: * @param id cargo slot * @return percents of cargo transported, or -1 if industry doesn't use this cargo slot */ - static inline int GetCargoTransportedPercentsIfValid(const Industry *i, uint id) + static inline int GetCargoTransportedPercentsIfValid(const Industry *i, size_t id) { - assert((size_t)id < std::size(i->produced_cargo)); + assert(id < std::size(i->produced_cargo)); if (i->produced_cargo[id] == INVALID_CARGO) return -1; return ToPercent8(i->last_month_pct_transported[id]); diff --git a/src/sl/newsignals_sl.cpp b/src/sl/newsignals_sl.cpp index bc8998d643..6ae3626fae 100644 --- a/src/sl/newsignals_sl.cpp +++ b/src/sl/newsignals_sl.cpp @@ -17,7 +17,7 @@ static void Save_NSID() { SlSetLength(4 + (_new_signal_style_mapping.size() * 5)); - SlWriteUint32(_new_signal_style_mapping.size()); + SlWriteUint32((uint)_new_signal_style_mapping.size()); for (const NewSignalStyleMapping &mapping : _new_signal_style_mapping) { SlWriteUint32(mapping.grfid); SlWriteByte(mapping.grf_local_id);