From 8d1563a1ededa0dc4cc91e92ef10564f3a3fa99a Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 15 Feb 2023 22:03:29 +0000 Subject: [PATCH] Various integer width type changes --- src/network/core/udp.cpp | 2 +- src/newgrf_newsignals.cpp | 2 +- src/newgrf_newsignals.h | 2 +- src/order_cmd.cpp | 4 ++-- src/schdispatch_gui.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/network/core/udp.cpp b/src/network/core/udp.cpp index a67c787502..4eecd59894 100644 --- a/src/network/core/udp.cpp +++ b/src/network/core/udp.cpp @@ -90,7 +90,7 @@ void NetworkUDPSocketHandler::SendPacket(Packet *p, NetworkAddress *recv, bool a Packet frag(PACKET_UDP_EX_MULTI); uint8 current_frag = 0; - uint16 offset = 0; + size_t offset = 0; while (offset < packet_size) { uint16 payload_size = (uint16)std::min(PAYLOAD_MTU, packet_size - offset); frag.Send_uint64(token); diff --git a/src/newgrf_newsignals.cpp b/src/newgrf_newsignals.cpp index 8e8e60bde6..882e0cd4a5 100644 --- a/src/newgrf_newsignals.cpp +++ b/src/newgrf_newsignals.cpp @@ -20,7 +20,7 @@ std::vector _new_signals_grfs; std::array _new_signal_styles; std::array _new_signal_style_mapping; -uint _num_new_signal_styles = 0; +uint8 _num_new_signal_styles = 0; uint16 _enabled_new_signal_styles_mask = 0; /* virtual */ uint32 NewSignalsScopeResolver::GetRandomBits() const diff --git a/src/newgrf_newsignals.h b/src/newgrf_newsignals.h index 50e3d2d59e..efcd6dfd61 100644 --- a/src/newgrf_newsignals.h +++ b/src/newgrf_newsignals.h @@ -56,7 +56,7 @@ struct NewSignalStyleMapping { inline bool operator==(const NewSignalStyleMapping& o) const { return grfid == o.grfid && grf_local_id == o.grf_local_id; } }; extern std::array _new_signal_style_mapping; -extern uint _num_new_signal_styles; +extern uint8 _num_new_signal_styles; extern uint16 _enabled_new_signal_styles_mask; /** Resolver for the new signals scope. */ diff --git a/src/order_cmd.cpp b/src/order_cmd.cpp index 514fc866f7..b5e54290ca 100644 --- a/src/order_cmd.cpp +++ b/src/order_cmd.cpp @@ -537,7 +537,7 @@ Order *OrderList::GetOrderAtFromList(int index) const */ VehicleOrderID OrderList::GetIndexOfOrder(const Order *order) const { - for (VehicleOrderID index = 0; index < this->order_index.size(); index++) { + for (VehicleOrderID index = 0; index < (VehicleOrderID)this->order_index.size(); index++) { if (this->order_index[index] == order) return index; } return INVALID_VEH_ORDER_ID; @@ -813,7 +813,7 @@ int OrderList::GetPositionInSharedOrderList(const Vehicle *v) const */ bool OrderList::IsCompleteTimetable() const { - for (VehicleOrderID index = 0; index < this->order_index.size(); index++) { + for (VehicleOrderID index = 0; index < (VehicleOrderID)this->order_index.size(); index++) { const Order *o = this->order_index[index]; /* Implicit orders are, by definition, not timetabled. */ if (o->IsType(OT_IMPLICIT)) continue; diff --git a/src/schdispatch_gui.cpp b/src/schdispatch_gui.cpp index 7fe4871214..00236b4bae 100644 --- a/src/schdispatch_gui.cpp +++ b/src/schdispatch_gui.cpp @@ -448,7 +448,7 @@ struct SchdispatchWindow : GeneralVehicleWindow { const DateTicksScaled end_tick = ds.GetScheduledDispatchStartTick() + ds.GetScheduledDispatchDuration(); for (int y = r.top + 1; num < maxval; y += this->resize.step_height) { /* Draw the rows */ - for (byte i = 0; i < this->num_columns && num < maxval; i++, num++) { + for (uint i = 0; i < this->num_columns && num < maxval; i++, num++) { /* Draw all departure time in the current row */ if (current_schedule != ds.GetScheduledDispatch().end()) { int x = r.left + (rtl ? (this->num_columns - i - 1) : i) * this->resize.step_width;