summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/ai/compat_0.7.nut7
-rw-r--r--bin/ai/compat_1.0.nut7
-rw-r--r--bin/ai/compat_1.1.nut7
-rw-r--r--bin/ai/compat_1.2.nut7
-rw-r--r--bin/ai/compat_1.3.nut7
-rw-r--r--bin/ai/compat_1.4.nut7
-rw-r--r--bin/ai/compat_1.5.nut7
-rw-r--r--bin/ai/compat_1.6.nut7
-rw-r--r--bin/ai/compat_1.7.nut7
-rw-r--r--bin/ai/compat_1.8.nut7
-rw-r--r--bin/ai/regression/tst_regression/main.nut6
-rw-r--r--bin/ai/regression/tst_regression/result.txt90
-rw-r--r--bin/game/compat_1.2.nut7
-rw-r--r--bin/game/compat_1.3.nut7
-rw-r--r--bin/game/compat_1.4.nut7
-rw-r--r--bin/game/compat_1.5.nut7
-rw-r--r--bin/game/compat_1.6.nut7
-rw-r--r--bin/game/compat_1.7.nut7
-rw-r--r--bin/game/compat_1.8.nut7
-rw-r--r--src/script/api/ai/ai_bridge.hpp.sq2
-rw-r--r--src/script/api/ai_changelog.hpp3
-rw-r--r--src/script/api/game/game_bridge.hpp.sq2
-rw-r--r--src/script/api/game_changelog.hpp3
-rw-r--r--src/script/api/script_bridge.cpp6
-rw-r--r--src/script/api/script_bridge.hpp4
25 files changed, 214 insertions, 21 deletions
diff --git a/bin/ai/compat_0.7.nut b/bin/ai/compat_0.7.nut
index 44e6acff9..98c03c673 100644
--- a/bin/ai/compat_0.7.nut
+++ b/bin/ai/compat_0.7.nut
@@ -367,3 +367,10 @@ AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+ return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
diff --git a/bin/ai/compat_1.0.nut b/bin/ai/compat_1.0.nut
index 5e7dd441f..627c949cc 100644
--- a/bin/ai/compat_1.0.nut
+++ b/bin/ai/compat_1.0.nut
@@ -119,3 +119,10 @@ AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+ return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
diff --git a/bin/ai/compat_1.1.nut b/bin/ai/compat_1.1.nut
index 32127b438..a47f3d5b1 100644
--- a/bin/ai/compat_1.1.nut
+++ b/bin/ai/compat_1.1.nut
@@ -56,3 +56,10 @@ AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+ return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
diff --git a/bin/ai/compat_1.2.nut b/bin/ai/compat_1.2.nut
index 0082415e4..95ccabda2 100644
--- a/bin/ai/compat_1.2.nut
+++ b/bin/ai/compat_1.2.nut
@@ -8,3 +8,10 @@
*/
AILog.Info("1.2 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+ return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
diff --git a/bin/ai/compat_1.3.nut b/bin/ai/compat_1.3.nut
index 036f3b5c3..fc8e06bf5 100644
--- a/bin/ai/compat_1.3.nut
+++ b/bin/ai/compat_1.3.nut
@@ -8,3 +8,10 @@
*/
AILog.Info("1.3 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+ return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
diff --git a/bin/ai/compat_1.4.nut b/bin/ai/compat_1.4.nut
index 3829bcc8e..169ead959 100644
--- a/bin/ai/compat_1.4.nut
+++ b/bin/ai/compat_1.4.nut
@@ -8,3 +8,10 @@
*/
AILog.Info("1.4 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+ return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
diff --git a/bin/ai/compat_1.5.nut b/bin/ai/compat_1.5.nut
index 71a46ff7a..681a708be 100644
--- a/bin/ai/compat_1.5.nut
+++ b/bin/ai/compat_1.5.nut
@@ -8,3 +8,10 @@
*/
AILog.Info("1.5 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+ return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
diff --git a/bin/ai/compat_1.6.nut b/bin/ai/compat_1.6.nut
index 8fb518e1b..5242821d1 100644
--- a/bin/ai/compat_1.6.nut
+++ b/bin/ai/compat_1.6.nut
@@ -8,3 +8,10 @@
*/
AILog.Info("1.6 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+ return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
diff --git a/bin/ai/compat_1.7.nut b/bin/ai/compat_1.7.nut
index 6eb0c980e..93884e663 100644
--- a/bin/ai/compat_1.7.nut
+++ b/bin/ai/compat_1.7.nut
@@ -8,3 +8,10 @@
*/
AILog.Info("1.7 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+ return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
diff --git a/bin/ai/compat_1.8.nut b/bin/ai/compat_1.8.nut
index 95ab6a76d..f3fa1bc0a 100644
--- a/bin/ai/compat_1.8.nut
+++ b/bin/ai/compat_1.8.nut
@@ -8,3 +8,10 @@
*/
AILog.Info("1.8 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+AIBridge._GetName <- AIBridge.GetName;
+AIBridge.GetName <- function(bridge_id)
+{
+ return AIBridge._GetName(bridge_id, AIVehicle.VT_RAIL);
+}
diff --git a/bin/ai/regression/tst_regression/main.nut b/bin/ai/regression/tst_regression/main.nut
index d36db03da..8b92b6f88 100644
--- a/bin/ai/regression/tst_regression/main.nut
+++ b/bin/ai/regression/tst_regression/main.nut
@@ -253,7 +253,11 @@ function Regression::Bridge()
if (AIBridge.IsValidBridge(i)) j++;
print(" Bridge " + i);
print(" IsValidBridge(): " + AIBridge.IsValidBridge(i));
- print(" GetName(): " + AIBridge.GetName(i));
+ print(" GetName():");
+ print(" VT_RAIL: " + AIBridge.GetName(i, AIVehicle.VT_RAIL));
+ print(" VT_ROAD: " + AIBridge.GetName(i, AIVehicle.VT_ROAD));
+ print(" VT_WATER: " + AIBridge.GetName(i, AIVehicle.VT_WATER));
+ print(" VT_AIR: " + AIBridge.GetName(i, AIVehicle.VT_AIR));
print(" GetMaxSpeed(): " + AIBridge.GetMaxSpeed(i));
print(" GetPrice(): " + AIBridge.GetPrice(i, 5));
print(" GetMaxLength(): " + AIBridge.GetMaxLength(i));
diff --git a/bin/ai/regression/tst_regression/result.txt b/bin/ai/regression/tst_regression/result.txt
index 210cf2696..e93b2e234 100644
--- a/bin/ai/regression/tst_regression/result.txt
+++ b/bin/ai/regression/tst_regression/result.txt
@@ -867,105 +867,165 @@ ERROR: IsEnd() is invalid as Begin() is never called
--Bridge--
Bridge -1
IsValidBridge(): false
- GetName(): (null : 0x00000000)
+ GetName():
+ VT_RAIL: (null : 0x00000000)
+ VT_ROAD: (null : 0x00000000)
+ VT_WATER: (null : 0x00000000)
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): -1
GetPrice(): -1
GetMaxLength(): -1
GetMinLength(): -1
Bridge 0
IsValidBridge(): true
- GetName(): Wooden rail bridge
+ GetName():
+ VT_RAIL: Wooden rail bridge
+ VT_ROAD: Wooden road bridge
+ VT_WATER: Aqueduct
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): 32
GetPrice(): 450
GetMaxLength(): 66
GetMinLength(): 2
Bridge 1
IsValidBridge(): true
- GetName(): Concrete rail bridge
+ GetName():
+ VT_RAIL: Concrete rail bridge
+ VT_ROAD: Concrete road bridge
+ VT_WATER: Aqueduct
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): 48
GetPrice(): 630
GetMaxLength(): 4
GetMinLength(): 2
Bridge 2
IsValidBridge(): true
- GetName(): Steel girder rail bridge
+ GetName():
+ VT_RAIL: Steel girder rail bridge
+ VT_ROAD: Steel girder road bridge
+ VT_WATER: Aqueduct
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): 64
GetPrice(): 811
GetMaxLength(): 7
GetMinLength(): 2
Bridge 3
IsValidBridge(): true
- GetName(): Reinforced concrete suspension rail bridge
+ GetName():
+ VT_RAIL: Reinforced concrete suspension rail bridge
+ VT_ROAD: Reinforced concrete suspension road bridge
+ VT_WATER: Aqueduct
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): 80
GetPrice(): 946
GetMaxLength(): 12
GetMinLength(): 4
Bridge 4
IsValidBridge(): true
- GetName(): Steel suspension rail bridge
+ GetName():
+ VT_RAIL: Steel suspension rail bridge
+ VT_ROAD: Steel suspension road bridge
+ VT_WATER: Aqueduct
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): 96
GetPrice(): 1042
GetMaxLength(): 66
GetMinLength(): 5
Bridge 5
IsValidBridge(): true
- GetName(): Steel suspension rail bridge
+ GetName():
+ VT_RAIL: Steel suspension rail bridge
+ VT_ROAD: Steel suspension road bridge
+ VT_WATER: Aqueduct
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): 112
GetPrice(): 1081
GetMaxLength(): 66
GetMinLength(): 5
Bridge 6
IsValidBridge(): true
- GetName(): Steel cantilever rail bridge
+ GetName():
+ VT_RAIL: Steel cantilever rail bridge
+ VT_ROAD: Steel cantilever road bridge
+ VT_WATER: Aqueduct
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): 160
GetPrice(): 1261
GetMaxLength(): 9
GetMinLength(): 5
Bridge 7
IsValidBridge(): true
- GetName(): Steel cantilever rail bridge
+ GetName():
+ VT_RAIL: Steel cantilever rail bridge
+ VT_ROAD: Steel cantilever road bridge
+ VT_WATER: Aqueduct
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): 208
GetPrice(): 1306
GetMaxLength(): 10
GetMinLength(): 5
Bridge 8
IsValidBridge(): true
- GetName(): Steel cantilever rail bridge
+ GetName():
+ VT_RAIL: Steel cantilever rail bridge
+ VT_ROAD: Steel cantilever road bridge
+ VT_WATER: Aqueduct
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): 240
GetPrice(): 1396
GetMaxLength(): 11
GetMinLength(): 5
Bridge 9
IsValidBridge(): true
- GetName(): Steel girder rail bridge
+ GetName():
+ VT_RAIL: Steel girder rail bridge
+ VT_ROAD: Steel girder road bridge
+ VT_WATER: Aqueduct
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): 256
GetPrice(): 1351
GetMaxLength(): 4
GetMinLength(): 2
Bridge 10
IsValidBridge(): false
- GetName(): (null : 0x00000000)
+ GetName():
+ VT_RAIL: (null : 0x00000000)
+ VT_ROAD: (null : 0x00000000)
+ VT_WATER: (null : 0x00000000)
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): -1
GetPrice(): -1
GetMaxLength(): -1
GetMinLength(): -1
Bridge 11
IsValidBridge(): false
- GetName(): (null : 0x00000000)
+ GetName():
+ VT_RAIL: (null : 0x00000000)
+ VT_ROAD: (null : 0x00000000)
+ VT_WATER: (null : 0x00000000)
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): -1
GetPrice(): -1
GetMaxLength(): -1
GetMinLength(): -1
Bridge 12
IsValidBridge(): false
- GetName(): (null : 0x00000000)
+ GetName():
+ VT_RAIL: (null : 0x00000000)
+ VT_ROAD: (null : 0x00000000)
+ VT_WATER: (null : 0x00000000)
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): -1
GetPrice(): -1
GetMaxLength(): -1
GetMinLength(): -1
Bridge 13
IsValidBridge(): false
- GetName(): (null : 0x00000000)
+ GetName():
+ VT_RAIL: (null : 0x00000000)
+ VT_ROAD: (null : 0x00000000)
+ VT_WATER: (null : 0x00000000)
+ VT_AIR: (null : 0x00000000)
GetMaxSpeed(): -1
GetPrice(): -1
GetMaxLength(): -1
diff --git a/bin/game/compat_1.2.nut b/bin/game/compat_1.2.nut
index aa5d48c3a..7822a44d0 100644
--- a/bin/game/compat_1.2.nut
+++ b/bin/game/compat_1.2.nut
@@ -23,3 +23,10 @@ GSNews.Create <- function(type, text, company)
{
return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
}
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+ return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
diff --git a/bin/game/compat_1.3.nut b/bin/game/compat_1.3.nut
index 78a03534d..0d7a2afb6 100644
--- a/bin/game/compat_1.3.nut
+++ b/bin/game/compat_1.3.nut
@@ -23,3 +23,10 @@ GSNews.Create <- function(type, text, company)
{
return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
}
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+ return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
diff --git a/bin/game/compat_1.4.nut b/bin/game/compat_1.4.nut
index a00431ed6..3ff887727 100644
--- a/bin/game/compat_1.4.nut
+++ b/bin/game/compat_1.4.nut
@@ -15,3 +15,10 @@ GSNews.Create <- function(type, text, company)
{
return GSNews._Create(type, text, company, GSNews.NR_NONE, 0);
}
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+ return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
diff --git a/bin/game/compat_1.5.nut b/bin/game/compat_1.5.nut
index 96a7647ff..b29a8ed2f 100644
--- a/bin/game/compat_1.5.nut
+++ b/bin/game/compat_1.5.nut
@@ -8,3 +8,10 @@
*/
GSLog.Info("1.5 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+ return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
diff --git a/bin/game/compat_1.6.nut b/bin/game/compat_1.6.nut
index d25189db2..a3f597528 100644
--- a/bin/game/compat_1.6.nut
+++ b/bin/game/compat_1.6.nut
@@ -8,3 +8,10 @@
*/
GSLog.Info("1.6 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+ return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
diff --git a/bin/game/compat_1.7.nut b/bin/game/compat_1.7.nut
index 1290443c4..b4c4d1bb3 100644
--- a/bin/game/compat_1.7.nut
+++ b/bin/game/compat_1.7.nut
@@ -8,3 +8,10 @@
*/
GSLog.Info("1.7 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+ return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
diff --git a/bin/game/compat_1.8.nut b/bin/game/compat_1.8.nut
index 6acdbc060..5aac3f8c1 100644
--- a/bin/game/compat_1.8.nut
+++ b/bin/game/compat_1.8.nut
@@ -8,3 +8,10 @@
*/
GSLog.Info("1.8 API compatibility in effect.");
+
+/* 1.9 adds a vehicle type parameter. */
+GSBridge._GetName <- GSBridge.GetName;
+GSBridge.GetName <- function(bridge_id)
+{
+ return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
+}
diff --git a/src/script/api/ai/ai_bridge.hpp.sq b/src/script/api/ai/ai_bridge.hpp.sq
index d09f56421..9a9b22300 100644
--- a/src/script/api/ai/ai_bridge.hpp.sq
+++ b/src/script/api/ai/ai_bridge.hpp.sq
@@ -37,7 +37,7 @@ void SQAIBridge_Register(Squirrel *engine)
SQAIBridge.DefSQStaticMethod(engine, &ScriptBridge::IsValidBridge, "IsValidBridge", 2, ".i");
SQAIBridge.DefSQStaticMethod(engine, &ScriptBridge::IsBridgeTile, "IsBridgeTile", 2, ".i");
SQAIBridge.DefSQStaticMethod(engine, &ScriptBridge::GetBridgeID, "GetBridgeID", 2, ".i");
- SQAIBridge.DefSQStaticMethod(engine, &ScriptBridge::GetName, "GetName", 2, ".i");
+ SQAIBridge.DefSQStaticMethod(engine, &ScriptBridge::GetName, "GetName", 3, ".ii");
SQAIBridge.DefSQStaticMethod(engine, &ScriptBridge::GetMaxSpeed, "GetMaxSpeed", 2, ".i");
SQAIBridge.DefSQStaticMethod(engine, &ScriptBridge::GetPrice, "GetPrice", 3, ".ii");
SQAIBridge.DefSQStaticMethod(engine, &ScriptBridge::GetMaxLength, "GetMaxLength", 2, ".i");
diff --git a/src/script/api/ai_changelog.hpp b/src/script/api/ai_changelog.hpp
index 03e9831a1..eb2b3a501 100644
--- a/src/script/api/ai_changelog.hpp
+++ b/src/script/api/ai_changelog.hpp
@@ -21,6 +21,9 @@
* API additions:
* \li AIAirport::GetMonthlyMaintenanceCost
*
+ * Other changes:
+ * \li AIBridge::GetName takes one extra parameter to refer the vehicle type
+ *
* \b 1.8.0
*
* No changes
diff --git a/src/script/api/game/game_bridge.hpp.sq b/src/script/api/game/game_bridge.hpp.sq
index 029a3ab3d..df0a94502 100644
--- a/src/script/api/game/game_bridge.hpp.sq
+++ b/src/script/api/game/game_bridge.hpp.sq
@@ -37,7 +37,7 @@ void SQGSBridge_Register(Squirrel *engine)
SQGSBridge.DefSQStaticMethod(engine, &ScriptBridge::IsValidBridge, "IsValidBridge", 2, ".i");
SQGSBridge.DefSQStaticMethod(engine, &ScriptBridge::IsBridgeTile, "IsBridgeTile", 2, ".i");
SQGSBridge.DefSQStaticMethod(engine, &ScriptBridge::GetBridgeID, "GetBridgeID", 2, ".i");
- SQGSBridge.DefSQStaticMethod(engine, &ScriptBridge::GetName, "GetName", 2, ".i");
+ SQGSBridge.DefSQStaticMethod(engine, &ScriptBridge::GetName, "GetName", 3, ".ii");
SQGSBridge.DefSQStaticMethod(engine, &ScriptBridge::GetMaxSpeed, "GetMaxSpeed", 2, ".i");
SQGSBridge.DefSQStaticMethod(engine, &ScriptBridge::GetPrice, "GetPrice", 3, ".ii");
SQGSBridge.DefSQStaticMethod(engine, &ScriptBridge::GetMaxLength, "GetMaxLength", 2, ".i");
diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp
index 7aad75b44..094449d73 100644
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.hpp
@@ -28,6 +28,9 @@
* \li GSViewport::ScrollClientTo
* \li GSGoal::QuestionClient
*
+ * Other changes:
+ * \li GSBridge::GetName takes one extra parameter to refer the vehicle type
+ *
* \b 1.8.0
*
* No changes
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)
diff --git a/src/script/api/script_bridge.hpp b/src/script/api/script_bridge.hpp
index e06928596..5327d4206 100644
--- a/src/script/api/script_bridge.hpp
+++ b/src/script/api/script_bridge.hpp
@@ -66,10 +66,12 @@ public:
/**
* Get the name of a bridge.
* @param bridge_id The bridge to get the name of.
+ * @param vehicle_type The vehicle-type of bridge to get the name of.
* @pre IsValidBridge(bridge_id).
+ * @pre vehicle_type == ScriptVehicle::VT_ROAD || vehicle_type == ScriptVehicle::VT_RAIL || vehicle_type == ScriptVehicle::VT_WATER
* @return The name the bridge has.
*/
- static char *GetName(BridgeID bridge_id);
+ static char *GetName(BridgeID bridge_id, ScriptVehicle::VehicleType vehicle_type);
/**
* Get the maximum speed of a bridge.
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-22 16:44:32 +0000