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

6
src/townname.cpp
View File

@@ -162,7 +162,7 @@ bool GenerateTownName(Randomizer &randomizer, uint32_t *townnameparts, TownNames
* @param seed seed
* @return seed transformed to a number from given range
*/
static inline uint32_t SeedChance(byte shift_by, int max, uint32_t seed)
static inline uint32_t SeedChance(uint8_t shift_by, int max, uint32_t seed)
{
return (GB(seed, shift_by, 16) * max) >> 16;
}
@@ -175,7 +175,7 @@ static inline uint32_t SeedChance(byte shift_by, int max, uint32_t seed)
* @param seed seed
* @return seed transformed to a number from given range
*/
static inline uint32_t SeedModChance(byte shift_by, int max, uint32_t seed)
static inline uint32_t SeedModChance(uint8_t shift_by, int max, uint32_t seed)
{
/* This actually gives *MUCH* more even distribution of the values
* than SeedChance(), which is absolutely horrible in that. If
@@ -198,7 +198,7 @@ static inline uint32_t SeedModChance(byte shift_by, int max, uint32_t seed)
* @param bias minimum value that can be returned
* @return seed transformed to a number from given range
*/
static inline int32_t SeedChanceBias(byte shift_by, int max, uint32_t seed, int bias)
static inline int32_t SeedChanceBias(uint8_t shift_by, int max, uint32_t seed, int bias)
{
return SeedChance(shift_by, max + bias, seed) - bias;
}