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

Adding of _t to (u)int types, and WChar to char32_t

Browse Source 
See: eaae0bb5e
This commit is contained in:
Jonathan G Rennison
2024-01-07 16:41:53 +00:00
parent 55d78a23be
commit 97e6f3062e
655 changed files with 7555 additions and 7555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/newgrf_newsignals.cpp
View File

@@ -20,21 +20,21 @@
std::vector<const GRFFile *> _new_signals_grfs;
std::array<NewSignalStyle, MAX_NEW_SIGNAL_STYLES> _new_signal_styles;
std::array<NewSignalStyleMapping, MAX_NEW_SIGNAL_STYLES> _new_signal_style_mapping;
uint8 _num_new_signal_styles = 0;
uint16 _enabled_new_signal_styles_mask = 0;
uint8_t _num_new_signal_styles = 0;
uint16_t _enabled_new_signal_styles_mask = 0;
/* virtual */ uint32 NewSignalsScopeResolver::GetRandomBits() const
/* virtual */ uint32_t NewSignalsScopeResolver::GetRandomBits() const
{
uint tmp = CountBits(this->tile + (TileX(this->tile) + TileY(this->tile)) * TILE_SIZE);
return GB(tmp, 0, 2);
}
static uint8 MapSignalStyle(uint8 style)
static uint8_t MapSignalStyle(uint8_t style)
{
return style != 0 ? _new_signal_styles[style - 1].grf_local_id : 0;
}
uint32 GetNewSignalsSideVariable()
uint32_t GetNewSignalsSideVariable()
{
bool side;
switch (_settings_game.construction.train_signal_side) {
@@ -45,7 +45,7 @@ uint32 GetNewSignalsSideVariable()
return side ? 1 : 0;
}
/* virtual */ uint32 NewSignalsScopeResolver::GetVariable(uint16 variable, uint32 parameter, GetVariableExtra *extra) const
/* virtual */ uint32_t NewSignalsScopeResolver::GetVariable(uint16_t variable, uint32_t parameter, GetVariableExtra *extra) const
{
if (this->tile == INVALID_TILE) {
switch (variable) {
@@ -98,14 +98,14 @@ GrfSpecFeature NewSignalsResolverObject::GetFeature() const
* @param prog Routing restriction program.
* @param z Signal pixel z.
*/
NewSignalsResolverObject::NewSignalsResolverObject(const GRFFile *grffile, TileIndex tile, TileContext context, uint32 param1, uint32 param2,
CustomSignalSpriteContext signal_context, uint8 signal_style, const TraceRestrictProgram *prog, uint z)
NewSignalsResolverObject::NewSignalsResolverObject(const GRFFile *grffile, TileIndex tile, TileContext context, uint32_t param1, uint32_t param2,
CustomSignalSpriteContext signal_context, uint8_t signal_style, const TraceRestrictProgram *prog, uint z)
: ResolverObject(grffile, CBID_NO_CALLBACK, param1, param2), newsignals_scope(*this, tile, context, signal_context, signal_style, prog, z)
{
this->root_spritegroup = grffile != nullptr ? grffile->new_signals_group : nullptr;
}
uint GetNewSignalsRestrictedSignalsInfo(const TraceRestrictProgram *prog, TileIndex tile, uint8 signal_style)
uint GetNewSignalsRestrictedSignalsInfo(const TraceRestrictProgram *prog, TileIndex tile, uint8_t signal_style)
{
uint result = 0;
if (signal_style != 0 && HasBit(_signal_style_masks.always_reserve_through, signal_style)) result |= 2;