Merge branch 'master' into jgrpp
# Conflicts: # regression/regression/result.txt # src/aircraft_cmd.cpp # src/airport_gui.cpp # src/articulated_vehicles.cpp # src/console_cmds.cpp # src/date_gui.cpp # src/engine.cpp # src/genworld_gui.cpp # src/gfx_layout_fallback.cpp # src/group_gui.cpp # src/hotkeys.cpp # src/network/core/tcp_connect.cpp # src/network/core/tcp_listen.h # src/newgrf.cpp # src/newgrf.h # src/newgrf_engine.cpp # src/newgrf_gui.cpp # src/newgrf_station.cpp # src/openttd.cpp # src/order_gui.cpp # src/os/macosx/osx_main.cpp # src/pathfinder/yapf/yapf_node_rail.hpp # src/rail_gui.cpp # src/saveload/afterload.cpp # src/saveload/cargopacket_sl.cpp # src/saveload/linkgraph_sl.cpp # src/saveload/station_sl.cpp # src/script/api/script_industrytype.cpp # src/settings.cpp # src/settings_gui.cpp # src/settings_table.cpp # src/settingsgen/settingsgen.cpp # src/station.cpp # src/station_cmd.cpp # src/strings.cpp # src/timer/timer_game_calendar.cpp # src/timer/timer_game_calendar.h # src/timer/timer_manager.h # src/timer/timer_window.cpp # src/timetable_cmd.cpp # src/toolbar_gui.cpp # src/town_cmd.cpp # src/town_gui.cpp # src/train_gui.cpp # src/vehicle_cmd.h # src/vehicle_gui.cpp # src/viewport.cpp # src/widgets/dropdown.cpp # src/window_func.h # src/window_gui.h
This commit is contained in:
Jonathan G Rennison
@@ -1388,7 +1388,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 75
|
||||
GetMaxSpeed(): 64
|
||||
GetPrice(): 8203
|
||||
GetMaxAge(): 5479
|
||||
GetMaxAge(): 5490
|
||||
GetRunningCost(): 820
|
||||
GetPower(): 300
|
||||
GetWeight(): 47
|
||||
@@ -1532,7 +1532,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 80
|
||||
GetMaxSpeed(): 112
|
||||
GetPrice(): 15234
|
||||
GetMaxAge(): 7671
|
||||
GetMaxAge(): 7686
|
||||
GetRunningCost(): 1968
|
||||
GetPower(): 1000
|
||||
GetWeight(): 131
|
||||
@@ -1550,7 +1550,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 84
|
||||
GetMaxSpeed(): 128
|
||||
GetPrice(): 22265
|
||||
GetMaxAge(): 7305
|
||||
GetMaxAge(): 7320
|
||||
GetRunningCost(): 2296
|
||||
GetPower(): 1200
|
||||
GetWeight(): 162
|
||||
@@ -3476,7 +3476,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 78
|
||||
GetMaxSpeed(): 56
|
||||
GetPrice(): 4921
|
||||
GetMaxAge(): 4383
|
||||
GetMaxAge(): 4392
|
||||
GetRunningCost(): 426
|
||||
GetPower(): 90
|
||||
GetWeight(): 10
|
||||
@@ -3602,7 +3602,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 77
|
||||
GetMaxSpeed(): 48
|
||||
GetPrice(): 4429
|
||||
GetMaxAge(): 5479
|
||||
GetMaxAge(): 5490
|
||||
GetRunningCost(): 421
|
||||
GetPower(): 120
|
||||
GetWeight(): 9
|
||||
@@ -3656,7 +3656,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 92
|
||||
GetMaxSpeed(): 48
|
||||
GetPrice(): 4716
|
||||
GetMaxAge(): 5479
|
||||
GetMaxAge(): 5490
|
||||
GetRunningCost(): 421
|
||||
GetPower(): 120
|
||||
GetWeight(): 9
|
||||
@@ -3764,7 +3764,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 98
|
||||
GetMaxSpeed(): 48
|
||||
GetPrice(): 4511
|
||||
GetMaxAge(): 5479
|
||||
GetMaxAge(): 5490
|
||||
GetRunningCost(): 421
|
||||
GetPower(): 120
|
||||
GetWeight(): 9
|
||||
@@ -3818,7 +3818,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 97
|
||||
GetMaxSpeed(): 48
|
||||
GetPrice(): 4306
|
||||
GetMaxAge(): 5479
|
||||
GetMaxAge(): 5490
|
||||
GetRunningCost(): 421
|
||||
GetPower(): 120
|
||||
GetWeight(): 9
|
||||
@@ -3872,7 +3872,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 87
|
||||
GetMaxSpeed(): 48
|
||||
GetPrice(): 4388
|
||||
GetMaxAge(): 5479
|
||||
GetMaxAge(): 5490
|
||||
GetRunningCost(): 421
|
||||
GetPower(): 120
|
||||
GetWeight(): 9
|
||||
@@ -3926,7 +3926,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 97
|
||||
GetMaxSpeed(): 48
|
||||
GetPrice(): 4675
|
||||
GetMaxAge(): 5479
|
||||
GetMaxAge(): 5490
|
||||
GetRunningCost(): 421
|
||||
GetPower(): 120
|
||||
GetWeight(): 9
|
||||
@@ -3980,7 +3980,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 98
|
||||
GetMaxSpeed(): 48
|
||||
GetPrice(): 4839
|
||||
GetMaxAge(): 5479
|
||||
GetMaxAge(): 5490
|
||||
GetRunningCost(): 421
|
||||
GetPower(): 120
|
||||
GetWeight(): 9
|
||||
@@ -4034,7 +4034,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 97
|
||||
GetMaxSpeed(): 48
|
||||
GetPrice(): 4962
|
||||
GetMaxAge(): 5479
|
||||
GetMaxAge(): 5490
|
||||
GetRunningCost(): 421
|
||||
GetPower(): 120
|
||||
GetWeight(): 9
|
||||
@@ -4088,7 +4088,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 82
|
||||
GetMaxSpeed(): 48
|
||||
GetPrice(): 4593
|
||||
GetMaxAge(): 5479
|
||||
GetMaxAge(): 5490
|
||||
GetRunningCost(): 421
|
||||
GetPower(): 120
|
||||
GetWeight(): 9
|
||||
@@ -4142,7 +4142,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 76
|
||||
GetMaxSpeed(): 48
|
||||
GetPrice(): 5947
|
||||
GetMaxAge(): 5479
|
||||
GetMaxAge(): 5490
|
||||
GetRunningCost(): 421
|
||||
GetPower(): 120
|
||||
GetWeight(): 9
|
||||
@@ -5060,7 +5060,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 99
|
||||
GetMaxSpeed(): 24
|
||||
GetPrice(): 30468
|
||||
GetMaxAge(): 10958
|
||||
GetMaxAge(): 10980
|
||||
GetRunningCost(): 2296
|
||||
GetPower(): -1
|
||||
GetWeight(): -1
|
||||
@@ -5096,7 +5096,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 88
|
||||
GetMaxSpeed(): 32
|
||||
GetPrice(): 18281
|
||||
GetMaxAge(): 10958
|
||||
GetMaxAge(): 10980
|
||||
GetRunningCost(): 1476
|
||||
GetPower(): -1
|
||||
GetWeight(): -1
|
||||
@@ -5186,7 +5186,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 81
|
||||
GetMaxSpeed(): 24
|
||||
GetPrice(): 24375
|
||||
GetMaxAge(): 10958
|
||||
GetMaxAge(): 10980
|
||||
GetRunningCost(): 2460
|
||||
GetPower(): -1
|
||||
GetWeight(): -1
|
||||
@@ -5258,7 +5258,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 58
|
||||
GetMaxSpeed(): 236
|
||||
GetPrice(): 28710
|
||||
GetMaxAge(): 7305
|
||||
GetMaxAge(): 7320
|
||||
GetRunningCost(): 2390
|
||||
GetPower(): -1
|
||||
GetWeight(): -1
|
||||
@@ -5276,7 +5276,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 95
|
||||
GetMaxSpeed(): 236
|
||||
GetPrice(): 30761
|
||||
GetMaxAge(): 8766
|
||||
GetMaxAge(): 8784
|
||||
GetRunningCost(): 2812
|
||||
GetPower(): -1
|
||||
GetWeight(): -1
|
||||
@@ -5330,7 +5330,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetReliability(): 77
|
||||
GetMaxSpeed(): 236
|
||||
GetPrice(): 30761
|
||||
GetMaxAge(): 10958
|
||||
GetMaxAge(): 10980
|
||||
GetRunningCost(): 2756
|
||||
GetPower(): -1
|
||||
GetWeight(): -1
|
||||
@@ -9321,8 +9321,8 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
GetEngineType(): 153
|
||||
GetUnitNumber(): 1
|
||||
GetAge(): 1
|
||||
GetMaxAge(): 5479
|
||||
GetAgeLeft(): 5478
|
||||
GetMaxAge(): 5490
|
||||
GetAgeLeft(): 5489
|
||||
GetCurrentSpeed(): 7
|
||||
GetRunningCost(): 421
|
||||
GetProfitThisYear(): -1
|
||||
@@ -9414,17 +9414,17 @@ ERROR: IsEnd() is invalid as Begin() is never called
|
||||
17 => 0
|
||||
16 => 0
|
||||
MaxAge ListDump:
|
||||
16 => 10958
|
||||
14 => 10958
|
||||
17 => 7305
|
||||
13 => 5479
|
||||
12 => 5479
|
||||
16 => 10980
|
||||
14 => 10980
|
||||
17 => 7320
|
||||
13 => 5490
|
||||
12 => 5490
|
||||
AgeLeft ListDump:
|
||||
16 => 10958
|
||||
14 => 10957
|
||||
17 => 7305
|
||||
13 => 5478
|
||||
12 => 5478
|
||||
16 => 10980
|
||||
14 => 10979
|
||||
17 => 7320
|
||||
13 => 5489
|
||||
12 => 5489
|
||||
CurrentSpeed ListDump:
|
||||
12 => 27
|
||||
17 => 0
|
||||
|
||||
Reference in New Issue
Block a user