mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-16 17:02:37 +01:00
Code Issues Releases Wiki Activity

Codechange: Use EnumBitSet for StationFacility.

Browse Source
This commit is contained in:
Peter Nelson
2025-02-12 19:42:26 +00:00
committed by Peter Nelson
parent 8d38308ebb
commit 75387b9e2b
39 changed files with 157 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/strings.cpp
View File

@@ -248,7 +248,7 @@ bool HaveDParamChanged(const std::span<const StringParameterData> backup)
return false;
}
static void StationGetSpecialString(StringBuilder &builder, StationFacility x);
static void StationGetSpecialString(StringBuilder &builder, StationFacilities x);
static bool GetSpecialNameString(StringBuilder &builder, StringID string, StringParameters &args);
static void FormatString(StringBuilder &builder, const char *str, StringParameters &args, uint case_index = 0, bool game_script = false, bool dry_run = false);
@@ -1824,7 +1824,7 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
}
case SCC_STATION_FEATURES: { // {STATIONFEATURES}
StationGetSpecialString(builder, args.GetNextParameter<StationFacility>());
StationGetSpecialString(builder, args.GetNextParameter<StationFacilities>());
break;
}
@@ -1846,13 +1846,13 @@ static void FormatString(StringBuilder &builder, const char *str_arg, StringPara
}
static void StationGetSpecialString(StringBuilder &builder, StationFacility x)
static void StationGetSpecialString(StringBuilder &builder, StationFacilities x)
{
if ((x & FACIL_TRAIN) != 0) builder.Utf8Encode(SCC_TRAIN);
if ((x & FACIL_TRUCK_STOP) != 0) builder.Utf8Encode(SCC_LORRY);
if ((x & FACIL_BUS_STOP) != 0) builder.Utf8Encode(SCC_BUS);
if ((x & FACIL_DOCK) != 0) builder.Utf8Encode(SCC_SHIP);
if ((x & FACIL_AIRPORT) != 0) builder.Utf8Encode(SCC_PLANE);
if (x.Test(StationFacility::Train)) builder.Utf8Encode(SCC_TRAIN);
if (x.Test(StationFacility::TruckStop)) builder.Utf8Encode(SCC_LORRY);
if (x.Test(StationFacility::BusStop)) builder.Utf8Encode(SCC_BUS);
if (x.Test(StationFacility::Dock)) builder.Utf8Encode(SCC_SHIP);
if (x.Test(StationFacility::Airport)) builder.Utf8Encode(SCC_PLANE);
}
static const char * const _silly_company_names[] = {