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

32
src/newgrf_railtype.cpp
View File

@@ -21,13 +21,13 @@
#include "safeguards.h"
/* virtual */ uint32 RailTypeScopeResolver::GetRandomBits() const
/* virtual */ uint32_t RailTypeScopeResolver::GetRandomBits() const
{
uint tmp = CountBits(this->tile + (TileX(this->tile) + TileY(this->tile)) * TILE_SIZE);
return GB(tmp, 0, 2);
}
/* virtual */ uint32 RailTypeScopeResolver::GetVariable(uint16 variable, uint32 parameter, GetVariableExtra *extra) const
/* virtual */ uint32_t RailTypeScopeResolver::GetVariable(uint16_t variable, uint32_t parameter, GetVariableExtra *extra) const
{
if (this->tile == INVALID_TILE) {
switch (variable) {
@@ -82,7 +82,7 @@
const DiagDirection dir_s = AxisToDiagDir(axis);
const DiagDirection dir_n = ReverseDiagDir(dir_s);
uint32 result = 0;
uint32_t result = 0;
auto test_dir = [&](DiagDirection dir, uint bit) {
const TileIndex t = TileAddByDiagDir(this->tile, dir);
if (t < MapSize() && IsLevelCrossingTile(t) && GetCrossingRoadAxis(t) == axis && is_usable_crossing(t)) {
@@ -106,7 +106,7 @@ GrfSpecFeature RailTypeResolverObject::GetFeature() const
return GSF_RAILTYPES;
}
uint32 RailTypeResolverObject::GetDebugID() const
uint32_t RailTypeResolverObject::GetDebugID() const
{
return this->railtype_scope.rti->label;
}
@@ -123,7 +123,7 @@ uint32 RailTypeResolverObject::GetDebugID() const
* @param z Signal pixel z.
* @param prog Routing restriction program.
*/
RailTypeResolverObject::RailTypeResolverObject(const RailTypeInfo *rti, TileIndex tile, TileContext context, RailTypeSpriteGroup rtsg, uint32 param1, uint32 param2,
RailTypeResolverObject::RailTypeResolverObject(const RailTypeInfo *rti, TileIndex tile, TileContext context, RailTypeSpriteGroup rtsg, uint32_t param1, uint32_t param2,
CustomSignalSpriteContext signal_context, const TraceRestrictProgram *prog, uint z)
: ResolverObject(rti != nullptr ? rti->grffile[rtsg] : nullptr, CBID_NO_CALLBACK, param1, param2), railtype_scope(*this, rti, tile, context, signal_context, prog, z)
{
@@ -154,9 +154,9 @@ SpriteID GetCustomRailSprite(const RailTypeInfo *rti, TileIndex tile, RailTypeSp
return group->GetResult();
}
inline uint8 RemapAspect(uint8 aspect, uint8 extra_aspects, uint8 style)
inline uint8_t RemapAspect(uint8_t aspect, uint8_t extra_aspects, uint8_t style)
{
if (likely(extra_aspects == 0 || _extra_aspects == 0)) return std::min<uint8>(aspect, 1);
if (likely(extra_aspects == 0 || _extra_aspects == 0)) return std::min<uint8_t>(aspect, 1);
if (aspect == 0) return 0;
if (style != 0 && HasBit(_signal_style_masks.combined_normal_shunt, style)) {
if (aspect == 1) {
@@ -168,15 +168,15 @@ inline uint8 RemapAspect(uint8 aspect, uint8 extra_aspects, uint8 style)
return aspect + 1;
}
static PalSpriteID GetRailTypeCustomSignalSprite(const RailTypeInfo *rti, TileIndex tile, SignalType type, SignalVariant var, uint8 aspect,
static PalSpriteID GetRailTypeCustomSignalSprite(const RailTypeInfo *rti, TileIndex tile, SignalType type, SignalVariant var, uint8_t aspect,
CustomSignalSpriteContext context, const TraceRestrictProgram *prog, uint z)
{
if (rti->group[RTSG_SIGNALS] == nullptr) return { 0, PAL_NONE };
if (type == SIGTYPE_PROG && !HasBit(rti->ctrl_flags, RTCF_PROGSIG)) return { 0, PAL_NONE };
if (type == SIGTYPE_NO_ENTRY && !HasBit(rti->ctrl_flags, RTCF_NOENTRYSIG)) return { 0, PAL_NONE };
uint32 param1 = (context == CSSC_GUI) ? 0x10 : 0x00;
uint32 param2 = (type << 16) | (var << 8) | RemapAspect(aspect, rti->signal_extra_aspects, 0);
uint32_t param1 = (context == CSSC_GUI) ? 0x10 : 0x00;
uint32_t param2 = (type << 16) | (var << 8) | RemapAspect(aspect, rti->signal_extra_aspects, 0);
if ((prog != nullptr) && HasBit(rti->ctrl_flags, RTCF_RESTRICTEDSIG)) SetBit(param2, 24);
RailTypeResolverObject object(rti, tile, TCX_NORMAL, RTSG_SIGNALS, param1, param2, context, prog, z);
@@ -197,8 +197,8 @@ static PalSpriteID GetRailTypeCustomSignalSprite(const RailTypeInfo *rti, TileIn
* @param gui Is the sprite being used on the map or in the GUI?
* @return The sprite to draw.
*/
CustomSignalSpriteResult GetCustomSignalSprite(const RailTypeInfo *rti, TileIndex tile, SignalType type, SignalVariant var, uint8 aspect,
CustomSignalSpriteContext context, uint8 style, const TraceRestrictProgram *prog, uint z)
CustomSignalSpriteResult GetCustomSignalSprite(const RailTypeInfo *rti, TileIndex tile, SignalType type, SignalVariant var, uint8_t aspect,
CustomSignalSpriteContext context, uint8_t style, const TraceRestrictProgram *prog, uint z)
{
if (_settings_client.gui.show_all_signal_default == SSDM_ON && style == 0) return { { 0, PAL_NONE }, false };
@@ -214,8 +214,8 @@ CustomSignalSpriteResult GetCustomSignalSprite(const RailTypeInfo *rti, TileInde
}
if (!HasBit(grf->new_signal_style_mask, style)) continue;
uint32 param1 = (context == CSSC_GUI) ? 0x10 : 0x00;
uint32 param2 = (type << 16) | (var << 8) | RemapAspect(aspect, grf->new_signal_extra_aspects, style);
uint32_t param1 = (context == CSSC_GUI) ? 0x10 : 0x00;
uint32_t param2 = (type << 16) | (var << 8) | RemapAspect(aspect, grf->new_signal_extra_aspects, style);
if ((prog != nullptr) && HasBit(grf->new_signal_ctrl_flags, NSCF_RESTRICTEDSIG)) SetBit(param2, 24);
NewSignalsResolverObject object(grf, tile, TCX_NORMAL, param1, param2, context, style, prog, z);
@@ -235,7 +235,7 @@ CustomSignalSpriteResult GetCustomSignalSprite(const RailTypeInfo *rti, TileInde
* @param grffile Originating GRF file.
* @return RailType or INVALID_RAILTYPE if the railtype is unknown.
*/
RailType GetRailTypeTranslation(uint8 railtype, const GRFFile *grffile)
RailType GetRailTypeTranslation(uint8_t railtype, const GRFFile *grffile)
{
if (grffile == nullptr || grffile->railtype_list.empty()) {
/* No railtype table present. Return railtype as-is (if valid), so it works for original railtypes. */
@@ -257,7 +257,7 @@ RailType GetRailTypeTranslation(uint8 railtype, const GRFFile *grffile)
* @param grffile The GRF to do the lookup for.
* @return the GRF internal ID.
*/
uint8 GetReverseRailTypeTranslation(RailType railtype, const GRFFile *grffile)
uint8_t GetReverseRailTypeTranslation(RailType railtype, const GRFFile *grffile)
{
/* No rail type table present, return rail type as-is */
if (grffile == nullptr || grffile->railtype_list.empty()) return railtype;