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

Fix narrowing warnings on MSVC

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-01-05 22:51:25 +00:00
parent b23077b08c
commit a33544ee17
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,7 +223,7 @@ void SerializeNetworkGameInfo(Packet *p, const NetworkServerGameInfo *info, bool
for (c = info->grfconfig; c != nullptr; c = c->next) { for (c = info->grfconfig; c != nullptr; c = c->next) {
if (!HasBit(c->flags, GCF_STATIC)) count++; if (!HasBit(c->flags, GCF_STATIC)) count++;
} }
p->Send_uint8(std::min<uint>(count, NETWORK_MAX_GRF_COUNT)); // Send number of GRFs p->Send_uint8(ClampTo<uint8>(std::min<uint>(count, NETWORK_MAX_GRF_COUNT))); // Send number of GRFs
/* Send actual GRF Identifications */ /* Send actual GRF Identifications */
for (c = info->grfconfig; c != nullptr; c = c->next) { for (c = info->grfconfig; c != nullptr; c = c->next) {

2
src/newgrf_debug_gui.cpp
View File

@@ -603,7 +603,7 @@ struct NewGRFInspectWindow : Window {
if (iter != lines.end() && iter->first == (int)highlight_tag) { if (iter != lines.end() && iter->first == (int)highlight_tag) {
/* Already stored, don't insert again */ /* Already stored, don't insert again */
} else { } else {
lines.insert(iter, std::make_pair<int, uint16>(highlight_tag, std::min<uint>(UINT16_MAX, i))); lines.insert(iter, std::make_pair<int, uint16>(highlight_tag, ClampTo<uint16>(i)));
} }
} }