dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,022 Commits 1 Branch 0 Tags
b8c7a0dd208076f86f26bb37d9c57ebb1116f515
Commit Graph

1921 Commits

Author SHA1 Message Date
Jonathan G Rennison
1cbb9960af Clear train lookahead when reaching an unreserved diverging junction 2021-03-31 22:09:41 +01:00
Jonathan G Rennison
49676552bb Use a flags parameter for ChooseTrainTrack mode 2021-03-31 21:42:36 +01:00
Jonathan G Rennison
48498969eb Fix through load crash when rear unit is longer than platform with no capacity 2021-03-28 13:48:35 +01:00
Jonathan G Rennison
923b2eb0a9 Fix tracerestrict train is loading status condition when predicting orders 2021-03-26 00:08:25 +00:00
Jonathan G Rennison
bac3bff716 Increase realistic braking signal sighting distance 
(Outside of signalled tunnel/bridges)
 2021-03-19 00:19:53 +00:00
Jonathan G Rennison
4386da53ee Slightly overestimate descents when deciding if reservation long enough 2021-03-18 14:09:19 +00:00
Jonathan G Rennison
8cf2b827a1 Avoid pessimising braking speed when descending slope 
When calculating speed using variable braking force
 2021-03-18 14:09:19 +00:00
Jonathan G Rennison
843dce94a4 Fix mispredicted stop location when through-loading 
When using realistic braking and skipped train parts have different
lengths.
 2021-03-18 10:37:07 +00:00
Jonathan G Rennison
f7dcd66f08 Fix unnecessary braking when leaving station with order without non-stop flag 2021-03-17 18:00:12 +00:00
Jonathan G Rennison
dbbe1bb3e4 Fix trains passing signals in original acceleration with braking models 2021-03-01 02:14:42 +00:00
Jonathan G Rennison
056606d2b6 Fix ApplyLookAheadItem assuming current_order == order in order list 
Fixes trains with no orders failing to brake in advance of stations
 2021-02-27 17:49:59 +00:00
Jonathan G Rennison
460d504269 Fix order index wrapping when depth exceeded in AdvanceOrderIndex 2021-02-27 14:57:17 +00:00
Jonathan G Rennison
dfecdf3afb Merge branch 'master' into jgrpp 
# Conflicts:
#	src/dock_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/terraform_gui.cpp
#	src/vehicle.cpp
#	src/video/allegro_v.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/dedicated_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
 2021-02-21 11:54:24 +00:00
frosch
d9b4413bc9 Codechange: rename sound ids to make more sense. (#8701) 2021-02-20 19:01:04 +01:00
Jonathan G Rennison
8fc4f13672 Fix train speed not being set to 0 for timetabled wait at waypoint orders 2021-02-15 21:54:46 +00:00
Jonathan G Rennison
35d720b0ad Add tracerestrict PBS end signal conditional 
This is for realistic braking long reserve
 2021-02-13 02:12:16 +00:00
Jonathan G Rennison
1b0e602ed5 Do not fill reservation lookahead if reservation could still be cancelled 
If ExtendTrainReservation finds a safe waiting point, this could
later not be a safe waiting point after advancing orders, due to
conditionally reserve through routing restrictions
 2021-02-11 22:31:48 +00:00
Jonathan G Rennison
8a814bbfe3 Add release slot train order 2021-02-10 22:30:22 +00:00
Jonathan G Rennison
62ea3b7794 Use original speeds when braking at station in original braking mode 
Partially reverts: 628077d0
 2021-02-10 18:05:15 +00:00
Jonathan G Rennison
0cc994c870 Save/restore implicit and TT order indices in VehicleOrderSaver 
Fix implicit/TT order indices being unexpectedly changed by
UpdateOrderDest if an order target is unsuitable.
This could assert UpdateVehicleTimetable
 2021-02-04 21:49:05 +00:00
Jonathan G Rennison
48395cb2db Fix assert when freeing train reservation from track edit command 2021-02-04 20:54:37 +00:00
Jonathan G Rennison
5283e16946 Fix misspelling of variable name: acceleration_type 2021-02-04 17:20:02 +00:00
Jonathan G Rennison
d52eebb829 Set value of cached_uncapped_decel in original acceleration model 
This is to avoid false positive cache mismatch messages
 2021-02-03 21:30:36 +00:00
Jonathan G Rennison
c1f1b5f3b3 Give monorail/maglev larger realistic braking deceleration limits 2021-02-03 21:22:09 +00:00
Jonathan G Rennison
4e1b1bc91e Fix wrong power units used for maglev realistic braking deceleration calc 2021-02-03 20:54:34 +00:00
Jonathan G Rennison
a9b82b817b Prevent signed overflow of lookahead position 2021-02-02 22:02:44 +00:00
Jonathan G Rennison
b7ddd486cf Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
 2021-02-01 17:07:34 +00:00
Jonathan G Rennison
f9956d88c3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/company_gui.cpp
#	src/lang/arabic_egypt.txt
#	src/lang/czech.txt
#	src/lang/esperanto.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/malay.txt
#	src/lang/polish.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/unfinished/urdu.txt
#	src/main_gui.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings.ini
 2021-01-31 01:11:12 +00:00
Jonathan G Rennison
6c3e5642f8 Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h
 2021-01-31 01:08:35 +00:00
Jonathan G Rennison
4e0804b791 Fix const issues around GetTrainStopLocation/GetCurrentMaxSpeed 2021-01-29 02:13:08 +00:00
Jonathan G Rennison
87c87649b8 Fix lookahead init inside a signalled tunnel/bridge only filling interior 2021-01-28 22:28:20 +00:00
Jonathan G Rennison
62fffddb3f Don't mark train stuck if no reachable track in TryPathReserve 2021-01-28 22:23:06 +00:00
Jonathan G Rennison
628077d0bb Fix missing stop due to speed when entering station with lookahead 2021-01-28 22:22:11 +00:00
Jonathan G Rennison
ed0ffb6220 Add feature: realistic train braking 
Add setting to select train braking model.
 2021-01-28 19:03:18 +00:00
Jonathan G Rennison
1838e8939f Improve handling of reversing inside bidi signalled tunnel/bridge 
Avoid train crashes when reversing trains either side of entrance tile
 2021-01-25 02:20:38 +00:00
Jonathan G Rennison
e0893de5c3 Set tunnel/bridge PBS exit to red when leaving 2021-01-18 20:57:55 +00:00
Jonathan G Rennison
aacb70d371 Debug: Extend random debug logging to also include state checksum updates 2021-01-18 20:57:55 +00:00
Jonathan G Rennison
4f44540eb9 Fix false positive desync messages for vehicle cached weight/length 2021-01-15 18:56:51 +00:00
Jonathan G Rennison
6a6d9f3773 Fix tunnel/bridge PBS start tile in TryPathReserve 2021-01-14 17:53:28 +00:00
Patric Stout
cd36e17160 Fix: don't allow free-wagon-chains to exceed max-train-length (#8533) 
This makes no sense, that a free-wagon-chain could be larger than
the maximum length of a train, as you cannot put an engine in
front of that anyway. And it prevents run-away AIs making very
silly long free-wagon-chains.
 2021-01-11 20:58:00 +01:00
Jonathan G Rennison
d666036ffd TBTR: Close vehicles window when acquiring idle vehicle for replacement 
This fixes possible duplicate vehicle windows, which is not allowed
 2021-01-10 18:46:37 +00:00
Jonathan G Rennison
515aeb04e0 TBTR: Add support for vehicle reversed flag 2021-01-10 18:10:20 +00:00
Jonathan G Rennison
e9f7783327 TBTR: Allow flipping direction of vehicles in template editor 2021-01-10 17:00:28 +00:00
Charles Pigott
9b800a96ed Codechange: Remove min/max functions in favour of STL variants (#8502) 2021-01-08 11:16:18 +01:00
Jonathan G Rennison
d1e23551ec Fix handling of bridge signals when reversing inside wormhole 
Fix handling of train detection when moving in wrong direction
 2021-01-06 17:13:54 +00:00
Jonathan G Rennison
d32a282112 Fix bridges not being redrawn after all signals reset when cleared 2021-01-06 17:13:45 +00:00
Patric Stout
dff7ee8e1c Fix #7611: keeps news about accidents around after vehicle is cleaned up (#8497) 
When a vehicle is cleaned up, all news that points to the news is
also removed. This was a bit evil, as it would also remove any
news related to crashed, acting like the crash never happened.
This left players a bit in the dark what was going on exactly.
 2021-01-05 21:39:23 +01:00
Matt Kimber
9b28b15e67 Codechange: create MutableSpriteCache to remove the need to cast Vehicle to a mutable type in render methods 2021-01-05 11:42:25 +01:00
Andy
0f91cb0479 Fix: GetCurveSpeedLimit needs railtype from current tile (#8466) 2021-01-03 22:19:06 +01:00
Jonathan G Rennison
f2c492c351 Fix reversing behind waypoint/signal in bridges/tunnels 2021-01-02 12:09:29 +00:00