diff options
author | SamuXarick <43006711+SamuXarick@users.noreply.github.com> | 2019-01-31 23:08:03 +0000 |
---|---|---|
committer | Charles Pigott <charlespigott@googlemail.com> | 2019-01-31 23:08:03 +0000 |
commit | 1e5a6765d9553d85e4acfb68999921791b8dd560 (patch) | |
tree | 91fb62a35b362ae8fd16dd09abc85223bf3d9ffd /src/script/api/script_bridge.cpp | |
parent | 029c48cf4a03b69838f3b347d0dcea9582f919e1 (diff) | |
download | openttd-1e5a6765d9553d85e4acfb68999921791b8dd560.tar.xz |
Change: Give AI/GSBridge::GetName an extra parameter to refer the vehicle type (#6988)
Diffstat (limited to 'src/script/api/script_bridge.cpp')
-rw-r--r-- | src/script/api/script_bridge.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/script/api/script_bridge.cpp b/src/script/api/script_bridge.cpp index 45bec466c..f532f11b7 100644 --- a/src/script/api/script_bridge.cpp +++ b/src/script/api/script_bridge.cpp @@ -16,6 +16,7 @@ #include "../../bridge_map.h" #include "../../strings_func.h" #include "../../date_func.h" +#include "table/strings.h" #include "../../safeguards.h" @@ -135,11 +136,12 @@ static void _DoCommandReturnBuildBridge1(class ScriptInstance *instance) return ScriptObject::DoCommand(tile, 0, 0, CMD_LANDSCAPE_CLEAR); } -/* static */ char *ScriptBridge::GetName(BridgeID bridge_id) +/* static */ char *ScriptBridge::GetName(BridgeID bridge_id, ScriptVehicle::VehicleType vehicle_type) { + EnforcePrecondition(NULL, vehicle_type == ScriptVehicle::VT_ROAD || vehicle_type == ScriptVehicle::VT_RAIL || vehicle_type == ScriptVehicle::VT_WATER); if (!IsValidBridge(bridge_id)) return NULL; - return GetString(::GetBridgeSpec(bridge_id)->transport_name[0]); + return GetString(vehicle_type == ScriptVehicle::VT_WATER ? STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT : ::GetBridgeSpec(bridge_id)->transport_name[vehicle_type]); } /* static */ int32 ScriptBridge::GetMaxSpeed(BridgeID bridge_id) |