dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various integer width type changes

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-02-15 22:03:29 +00:00
parent fbfbaa118a
commit 8d1563a1ed
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/core/udp.cpp
View File

@@ -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<size_t>(PAYLOAD_MTU, packet_size - offset);
frag.Send_uint64(token);

2
src/newgrf_newsignals.cpp
View File

@@ -20,7 +20,7 @@
std::vector<const GRFFile *> _new_signals_grfs;
std::array<NewSignalStyle, MAX_NEW_SIGNAL_STYLES> _new_signal_styles;
std::array<NewSignalStyleMapping, MAX_NEW_SIGNAL_STYLES> _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

2
src/newgrf_newsignals.h
View File

@@ -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<NewSignalStyleMapping, MAX_NEW_SIGNAL_STYLES> _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. */

4
src/order_cmd.cpp
View File

@@ -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;

2
src/schdispatch_gui.cpp
View File

@@ -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;