summaryrefslogtreecommitdiff
path: root/bin/ai
diff options
context:
space:
mode:
authorSamuXarick <43006711+SamuXarick@users.noreply.github.com>2019-01-31 23:08:03 +0000
committerCharles Pigott <charlespigott@googlemail.com>2019-01-31 23:08:03 +0000
commit1e5a6765d9553d85e4acfb68999921791b8dd560 (patch)
tree91fb62a35b362ae8fd16dd09abc85223bf3d9ffd /bin/ai
parent029c48cf4a03b69838f3b347d0dcea9582f919e1 (diff)
downloadopenttd-1e5a6765d9553d85e4acfb68999921791b8dd560.tar.xz
Change: Give AI/GSBridge::GetName an extra parameter to refer the vehicle type (#6988)
Diffstat (limited to 'bin/ai')
-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
12 files changed, 150 insertions, 16 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