mirror of https://github.com/OpenTTD/OpenTTD
Change: Don't replace stripped control codes with '?' for scripts. (#14028)
parent
45917dbaa3
commit
67d6089f39
|
@ -32,7 +32,7 @@
|
|||
{
|
||||
if (!IsValidBaseStation(station_id)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(::Station::IsValidID(station_id) ? STR_STATION_NAME : STR_WAYPOINT_NAME, station_id));
|
||||
return ::StrMakeValid(::GetString(::Station::IsValidID(station_id) ? STR_STATION_NAME : STR_WAYPOINT_NAME, station_id), {});
|
||||
}
|
||||
|
||||
/* static */ bool ScriptBaseStation::SetName(StationID station_id, Text *name)
|
||||
|
|
|
@ -135,7 +135,7 @@ static void _DoCommandReturnBuildBridge1(class ScriptInstance *instance)
|
|||
EnforcePrecondition(std::nullopt, vehicle_type == ScriptVehicle::VT_ROAD || vehicle_type == ScriptVehicle::VT_RAIL || vehicle_type == ScriptVehicle::VT_WATER);
|
||||
if (!IsValidBridge(bridge_type)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(vehicle_type == ScriptVehicle::VT_WATER ? STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT : ::GetBridgeSpec(bridge_type)->transport_name[vehicle_type]));
|
||||
return ::StrMakeValid(::GetString(vehicle_type == ScriptVehicle::VT_WATER ? STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT : ::GetBridgeSpec(bridge_type)->transport_name[vehicle_type]), {});
|
||||
}
|
||||
|
||||
/* static */ SQInteger ScriptBridge::GetMaxSpeed(BridgeType bridge_type)
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
{
|
||||
if (!IsValidCargo(cargo_type)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(STR_JUST_CARGO_LIST, 1ULL << cargo_type));
|
||||
return ::StrMakeValid(::GetString(STR_JUST_CARGO_LIST, 1ULL << cargo_type), {});
|
||||
}
|
||||
|
||||
/* static */ std::optional<std::string> ScriptCargo::GetCargoLabel(CargoType cargo_type)
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
company = ResolveCompanyID(company);
|
||||
if (company == ScriptCompany::COMPANY_INVALID) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(STR_COMPANY_NAME, ScriptCompany::FromScriptCompanyID(company)));
|
||||
return ::StrMakeValid(::GetString(STR_COMPANY_NAME, ScriptCompany::FromScriptCompanyID(company)), {});
|
||||
}
|
||||
|
||||
/* static */ bool ScriptCompany::SetPresidentName(Text *name)
|
||||
|
@ -99,7 +99,7 @@
|
|||
company = ResolveCompanyID(company);
|
||||
if (company == ScriptCompany::COMPANY_INVALID) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(STR_PRESIDENT_NAME, ScriptCompany::FromScriptCompanyID(company)));
|
||||
return ::StrMakeValid(::GetString(STR_PRESIDENT_NAME, ScriptCompany::FromScriptCompanyID(company)), {});
|
||||
}
|
||||
|
||||
/* static */ bool ScriptCompany::SetPresidentGender(Gender gender)
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
{
|
||||
if (!IsValidEngine(engine_id)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(STR_ENGINE_NAME, engine_id));
|
||||
return ::StrMakeValid(::GetString(STR_ENGINE_NAME, engine_id), {});
|
||||
}
|
||||
|
||||
/* static */ CargoType ScriptEngine::GetCargoType(EngineID engine_id)
|
||||
|
|
|
@ -34,7 +34,7 @@ std::optional<std::string> ScriptEventEnginePreview::GetName()
|
|||
{
|
||||
if (!this->IsEngineValid()) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(STR_ENGINE_NAME, this->engine));
|
||||
return ::StrMakeValid(::GetString(STR_ENGINE_NAME, this->engine), {});
|
||||
}
|
||||
|
||||
CargoType ScriptEventEnginePreview::GetCargoType()
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
{
|
||||
if (!IsValidGroup(group_id)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(STR_GROUP_NAME, group_id));
|
||||
return ::StrMakeValid(::GetString(STR_GROUP_NAME, group_id), {});
|
||||
}
|
||||
|
||||
/* static */ bool ScriptGroup::SetParent(GroupID group_id, GroupID parent_group_id)
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
{
|
||||
if (!IsValidIndustry(industry_id)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(STR_INDUSTRY_NAME, industry_id));
|
||||
return ::StrMakeValid(::GetString(STR_INDUSTRY_NAME, industry_id), {});
|
||||
}
|
||||
|
||||
/* static */ ScriptDate::Date ScriptIndustry::GetConstructionDate(IndustryID industry_id)
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
{
|
||||
if (!IsValidIndustryType(industry_type)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(::GetIndustrySpec(industry_type)->name));
|
||||
return ::StrMakeValid(::GetString(::GetIndustrySpec(industry_type)->name), {});
|
||||
}
|
||||
|
||||
/* static */ ScriptList *ScriptIndustryType::GetProducedCargo(IndustryType industry_type)
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
{
|
||||
EnforcePrecondition(std::nullopt, IsValidObjectType(object_type));
|
||||
|
||||
return ::StrMakeValid(::GetString(ObjectSpec::Get(object_type)->name));
|
||||
return ::StrMakeValid(::GetString(ObjectSpec::Get(object_type)->name), {});
|
||||
}
|
||||
|
||||
/* static */ SQInteger ScriptObjectType::GetViews(ObjectType object_type)
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
{
|
||||
if (!IsRailTypeAvailable(rail_type)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(GetRailTypeInfo((::RailType)rail_type)->strings.menu_text));
|
||||
return ::StrMakeValid(::GetString(GetRailTypeInfo((::RailType)rail_type)->strings.menu_text), {});
|
||||
}
|
||||
|
||||
/* static */ bool ScriptRail::IsRailTile(TileIndex tile)
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
{
|
||||
if (!IsRoadTypeAvailable(road_type)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(GetRoadTypeInfo((::RoadType)road_type)->strings.name));
|
||||
return ::StrMakeValid(::GetString(GetRoadTypeInfo((::RoadType)road_type)->strings.name), {});
|
||||
}
|
||||
|
||||
/* static */ bool ScriptRoad::IsRoadTile(TileIndex tile)
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
{
|
||||
if (!IsValidSign(sign_id)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(STR_SIGN_NAME, sign_id));
|
||||
return ::StrMakeValid(::GetString(STR_SIGN_NAME, sign_id), {});
|
||||
}
|
||||
|
||||
/* static */ TileIndex ScriptSign::GetLocation(SignID sign_id)
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
{
|
||||
if (!IsValidTown(town_id)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(STR_TOWN_NAME, town_id));
|
||||
return ::StrMakeValid(::GetString(STR_TOWN_NAME, town_id), {});
|
||||
}
|
||||
|
||||
/* static */ bool ScriptTown::SetName(TownID town_id, Text *name)
|
||||
|
|
|
@ -304,7 +304,7 @@
|
|||
{
|
||||
if (!IsPrimaryVehicle(vehicle_id)) return std::nullopt;
|
||||
|
||||
return ::StrMakeValid(::GetString(STR_VEHICLE_NAME, vehicle_id));
|
||||
return ::StrMakeValid(::GetString(STR_VEHICLE_NAME, vehicle_id), {});
|
||||
}
|
||||
|
||||
/* static */ SQInteger ScriptVehicle::GetAge(VehicleID vehicle_id)
|
||||
|
|
Loading…
Reference in New Issue