From 67d6089f39b6b4a206884c50bf90024bb8834695 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Fri, 18 Apr 2025 17:20:08 +0100 Subject: [PATCH] Change: Don't replace stripped control codes with '?' for scripts. (#14028) --- src/script/api/script_basestation.cpp | 2 +- src/script/api/script_bridge.cpp | 2 +- src/script/api/script_cargo.cpp | 2 +- src/script/api/script_company.cpp | 4 ++-- src/script/api/script_engine.cpp | 2 +- src/script/api/script_event_types.cpp | 2 +- src/script/api/script_group.cpp | 2 +- src/script/api/script_industry.cpp | 2 +- src/script/api/script_industrytype.cpp | 2 +- src/script/api/script_objecttype.cpp | 2 +- src/script/api/script_rail.cpp | 2 +- src/script/api/script_road.cpp | 2 +- src/script/api/script_sign.cpp | 2 +- src/script/api/script_town.cpp | 2 +- src/script/api/script_vehicle.cpp | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/script/api/script_basestation.cpp b/src/script/api/script_basestation.cpp index 91ff72e152..26a4ca9b45 100644 --- a/src/script/api/script_basestation.cpp +++ b/src/script/api/script_basestation.cpp @@ -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) diff --git a/src/script/api/script_bridge.cpp b/src/script/api/script_bridge.cpp index eaf7b8325c..97bd0637f0 100644 --- a/src/script/api/script_bridge.cpp +++ b/src/script/api/script_bridge.cpp @@ -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) diff --git a/src/script/api/script_cargo.cpp b/src/script/api/script_cargo.cpp index 63c86a7695..d38ff9300a 100644 --- a/src/script/api/script_cargo.cpp +++ b/src/script/api/script_cargo.cpp @@ -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 ScriptCargo::GetCargoLabel(CargoType cargo_type) diff --git a/src/script/api/script_company.cpp b/src/script/api/script_company.cpp index 577a9a96a2..9def32f0d8 100644 --- a/src/script/api/script_company.cpp +++ b/src/script/api/script_company.cpp @@ -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) diff --git a/src/script/api/script_engine.cpp b/src/script/api/script_engine.cpp index f13cf5654b..e7cf0a025a 100644 --- a/src/script/api/script_engine.cpp +++ b/src/script/api/script_engine.cpp @@ -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) diff --git a/src/script/api/script_event_types.cpp b/src/script/api/script_event_types.cpp index 541e124e38..973339675e 100644 --- a/src/script/api/script_event_types.cpp +++ b/src/script/api/script_event_types.cpp @@ -34,7 +34,7 @@ std::optional 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() diff --git a/src/script/api/script_group.cpp b/src/script/api/script_group.cpp index 352e78b28f..486032cd70 100644 --- a/src/script/api/script_group.cpp +++ b/src/script/api/script_group.cpp @@ -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) diff --git a/src/script/api/script_industry.cpp b/src/script/api/script_industry.cpp index b04e5a47a9..dfaccb8b40 100644 --- a/src/script/api/script_industry.cpp +++ b/src/script/api/script_industry.cpp @@ -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) diff --git a/src/script/api/script_industrytype.cpp b/src/script/api/script_industrytype.cpp index b6a89e86b5..5a6929deec 100644 --- a/src/script/api/script_industrytype.cpp +++ b/src/script/api/script_industrytype.cpp @@ -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) diff --git a/src/script/api/script_objecttype.cpp b/src/script/api/script_objecttype.cpp index a0a7ee6e51..82303b331c 100644 --- a/src/script/api/script_objecttype.cpp +++ b/src/script/api/script_objecttype.cpp @@ -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) diff --git a/src/script/api/script_rail.cpp b/src/script/api/script_rail.cpp index a1edc6c510..85982b8e5c 100644 --- a/src/script/api/script_rail.cpp +++ b/src/script/api/script_rail.cpp @@ -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) diff --git a/src/script/api/script_road.cpp b/src/script/api/script_road.cpp index b6a3cceb14..1a689f8647 100644 --- a/src/script/api/script_road.cpp +++ b/src/script/api/script_road.cpp @@ -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) diff --git a/src/script/api/script_sign.cpp b/src/script/api/script_sign.cpp index ea4cfddbb6..10f73adc1f 100644 --- a/src/script/api/script_sign.cpp +++ b/src/script/api/script_sign.cpp @@ -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) diff --git a/src/script/api/script_town.cpp b/src/script/api/script_town.cpp index 832851571b..e4e0c12623 100644 --- a/src/script/api/script_town.cpp +++ b/src/script/api/script_town.cpp @@ -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) diff --git a/src/script/api/script_vehicle.cpp b/src/script/api/script_vehicle.cpp index 0f491fb966..ccc869fcdc 100644 --- a/src/script/api/script_vehicle.cpp +++ b/src/script/api/script_vehicle.cpp @@ -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)