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

14
src/newgrf_townname.h
View File

@@ -18,28 +18,28 @@
struct NamePart {
std::string text; ///< If probability bit 7 is clear
byte id; ///< If probability bit 7 is set
byte prob; ///< The relative probability of the following name to appear in the bottom 7 bits.
uint8_t id; ///< If probability bit 7 is set
uint8_t prob; ///< The relative probability of the following name to appear in the bottom 7 bits.
};
struct NamePartList {
byte bitstart; ///< Start of random seed bits to use.
byte bitcount; ///< Number of bits of random seed to use.
uint8_t bitstart; ///< Start of random seed bits to use.
uint8_t bitcount; ///< Number of bits of random seed to use.
uint16_t maxprob; ///< Total probability of all parts.
std::vector<NamePart> parts; ///< List of parts to choose from.
};
struct TownNameStyle {
StringID name; ///< String ID of this town name style.
byte id; ///< Index within partlist for this town name style.
uint8_t id; ///< Index within partlist for this town name style.
TownNameStyle(StringID name, byte id) : name(name), id(id) { }
TownNameStyle(StringID name, uint8_t id) : name(name), id(id) { }
};
struct GRFTownName {
static const uint MAX_LISTS = 128; ///< Maximum number of town name lists that can be defined per GRF.
uint32_t grfid; ///< GRF ID of NewGRF.
uint32_t grfid; ///< GRF ID of NewGRF.
std::vector<TownNameStyle> styles; ///< Style names defined by the Town Name NewGRF.
std::vector<NamePartList> partlists[MAX_LISTS]; ///< Lists of town name parts.
};