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

Fix narrowing conversion warnings

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-01-03 22:31:36 +00:00
parent 51a37ecf2a
commit 7e313d120c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/economy.cpp
View File

@@ -1200,7 +1200,7 @@ uint DeliverGoodsToIndustryEqually(const Station *st, CargoID cargo_type, uint n
if (num_pieces > 0) { if (num_pieces > 0) {
assert(num_pieces < acceptingIndustries.size()); assert(num_pieces < acceptingIndustries.size());
uint idx = RandomRange(acceptingIndustries.size()); uint idx = RandomRange((uint)acceptingIndustries.size());
for (uint i = 0; i < acceptingIndustries.size(); ++i) { for (uint i = 0; i < acceptingIndustries.size(); ++i) {
if (acceptingIndustries[idx].capacity > 0) { if (acceptingIndustries[idx].capacity > 0) {
distributeCargo(acceptingIndustries[idx], 1); distributeCargo(acceptingIndustries[idx], 1);

4
src/saveload/company_sl.cpp
View File

@@ -624,14 +624,14 @@ static void Save_PLYP()
} }
std::vector<byte> buffer = SlSaveToVector([](void *) { std::vector<byte> buffer = SlSaveToVector([](void *) {
SlWriteUint32(_network_company_server_id.size()); SlWriteUint32((uint32)_network_company_server_id.size());
MemoryDumper::GetCurrent()->CopyBytes((const uint8 *)_network_company_server_id.data(), _network_company_server_id.size()); MemoryDumper::GetCurrent()->CopyBytes((const uint8 *)_network_company_server_id.data(), _network_company_server_id.size());
for (const Company *c : Company::Iterate()) { for (const Company *c : Company::Iterate()) {
SlWriteUint16(c->index); SlWriteUint16(c->index);
const std::string &password = _network_company_states[c->index].password; const std::string &password = _network_company_states[c->index].password;
SlWriteUint32(password.size()); SlWriteUint32((uint32)password.size());
MemoryDumper::GetCurrent()->CopyBytes((const uint8 *)password.data(), password.size()); MemoryDumper::GetCurrent()->CopyBytes((const uint8 *)password.data(), password.size());
} }