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

Merge branch 'master' into jgrpp

Browse Source 
Remove 'byte' typedef
This commit is contained in:
Jonathan G Rennison
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_townname.cpp
View File

@@ -47,11 +47,11 @@ void DelGRFTownName(uint32_t grfid)
_grf_townnames.erase(std::find_if(std::begin(_grf_townnames), std::end(_grf_townnames), [&grfid](const GRFTownName &t){ return t.grfid == grfid; }));
}
static void RandomPart(StringBuilder builder, const GRFTownName *t, uint32_t seed, byte id)
static void RandomPart(StringBuilder builder, const GRFTownName *t, uint32_t seed, uint8_t id)
{
assert(t != nullptr);
for (const auto &partlist : t->partlists[id]) {
byte count = partlist.bitcount;
uint8_t count = partlist.bitcount;
uint16_t maxprob = partlist.maxprob;
uint32_t r = (GB(seed, partlist.bitstart, count) * maxprob) >> count;
for (const auto &part : partlist.parts) {