Commit Graph

136 Commits

Author SHA1 Message Date
Jonathan G Rennison
b299c4dce8 Tracerestrict: Add enum type for TRIT_LONG_RESERVE values 2023-10-03 18:11:41 +01:00
Jonathan G Rennison
a18f3274b4 Rename close window functions to match upstream 2023-09-15 21:17:25 +01:00
Jonathan G Rennison
ead18b2af2 Merge branch 'master' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	src/3rdparty/md5/md5.h
#	src/3rdparty/squirrel/squirrel/squtils.h
#	src/animated_tile.cpp
#	src/console_func.h
#	src/core/CMakeLists.txt
#	src/core/container_func.hpp
#	src/core/smallstack_type.hpp
#	src/crashlog.cpp
#	src/crashlog.h
#	src/debug.h
#	src/economy.cpp
#	src/gamelog.cpp
#	src/industry_gui.cpp
#	src/lang/catalan.txt
#	src/misc_gui.cpp
#	src/network/network_content.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/newgrf_gui.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_cmd.cpp
#	src/saveload/animated_tile_sl.cpp
#	src/script/api/script_tilelist.cpp
#	src/settings.cpp
#	src/settingsgen/settingsgen.cpp
#	src/sl/oldloader_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/viewport_sprite_sorter.h
2023-07-02 12:02:36 +01:00
Jonathan G Rennison
13183d3f13 Add command result flag for whether SetResultData was called
Use for tracerestrict validation result fail offset
2023-05-30 23:41:19 +01:00
Jonathan G Rennison
731f2fb46e Tracerestrict: Add button to share program onto other signals 2023-05-16 21:10:54 +01:00
Jonathan G Rennison
65cc6623dd Tracerestrict: Add button to duplicate instruction/block 2023-05-05 23:34:48 +01:00
Jonathan G Rennison
55f11129c8 Tracerestrict: Add status test for if train is stopping at order destination
Station/waypoint of current order
2023-04-11 22:01:51 +01:00
Jonathan G Rennison
f13f8cd740 Tracerestrict: Improve program validator
Check all instruction subtypes and valid enum values
Return failure instead of asserting for invalid instruction subtypes
Identify which instruction triggered validation failure
2023-03-09 03:01:20 +00:00
Jonathan G Rennison
119e24fe9d Tracerestrict: Reset dual instruction value when changing instruction type 2023-03-08 20:25:42 +00:00
Jonathan G Rennison
70311c0843 Tracerestrict: Use btree_multimap for slot vehicle index 2023-03-07 00:31:14 +00:00
Jonathan G Rennison
07b7cc5652 Tracerestrict: Add condition whether reservation passes through tile 2023-02-06 19:54:14 +00:00
Jonathan G Rennison
3877bb31ef Changing day length or date no longer changes time in minutes
Add offset variables for scaled date ticks.
Adjust offset when changing day length or date, such that scaled
date ticks remain the same.
Store _scaled_tick_counter and scaled date ticks offset in the savagame.
2022-12-16 19:15:46 +00:00
Jonathan G Rennison
38c2fa3b66 Add a change counter value special order type 2022-10-13 20:09:20 +01:00
Jonathan G Rennison
b3a8dd44e4 Fix crash when removing routing restriction with reserve through from tunnel/bridge 2022-09-22 18:12:24 +01:00
Jonathan G Rennison
7c4c75d181 Add tracerestrict conditional on direction of order target from signal 2022-09-07 22:53:03 +01:00
Jonathan G Rennison
12566f05ca Add tracerestrict actions used flags for order conditionals present 2022-07-01 00:16:26 +01:00
Jonathan G Rennison
6a69a5495f Add tracerestrict action to set combined normal/shunt signal mode
Add associated conditional to get reservation end tile
2022-06-28 01:16:57 +01:00
Jonathan G Rennison
bdd73a19a1 Add signal style flag for unconditional reserve through
Add map bits for unconditional reserve through
Adjust signal aspect/state handling
2022-06-19 04:15:27 +01:00
Jonathan G Rennison
4d04a757cc Debug: Add new signals support to GRF debug window 2022-06-15 21:36:55 +01:00
Jonathan G Rennison
cf5eef515e Signals: Add GRF restriction info bit for may reverse 2022-06-15 17:49:54 +01:00
Jonathan G Rennison
ba52fbeb91 Signals: Add variable for restriction info, add bit for reserve through 2022-06-12 09:00:31 +01:00
Jonathan G Rennison
28724d651d Tracerestrict: Add button to highlight all signals using program 2022-06-11 23:29:37 +01:00
Jonathan G Rennison
b37209c3af Tracerestrict: Programs maintain a list of signals referencing them 2022-06-11 22:15:19 +01:00
Jonathan G Rennison
c06acd3c47 Tracerestrict: Avoid double lookup when setting is restricted map bit 2022-06-11 22:12:43 +01:00
Jonathan G Rennison
ccfcc22c03 Tracerestrict: Return error instead of assert for unknown subcommands 2022-06-11 20:24:05 +01:00
Jonathan G Rennison
02dabad81e Tracerestrict: Add flag for whether reserve through is always set 2022-06-11 16:40:32 +01:00
Jonathan G Rennison
c4ea3e0335 Fully simulate slot occupancy changes in PBS res end dry-run mode 2022-03-14 02:26:03 +00:00
Jonathan G Rennison
221120090e Fix wrong prefix in trace restrict enum
TRSACF_REMOVE_SPEED_ADAPT_EXEMPT in
TraceRestrictSpeedAdaptationControlField
2022-03-07 00:40:22 +00:00
Jonathan G Rennison
92142e5684 Add routing restriction action to make exempt from speed adaptation 2022-03-06 22:39:53 +00:00
Jonathan G Rennison
e5a421b65a Merge branch 'master' into jgrpp
# Conflicts:
#	src/economy.cpp
#	src/linkgraph/refresh.cpp
#	src/order_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_base.h
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
2022-03-04 18:17:44 +00:00
Jonathan G Rennison
904ff6757d Add slot support to road vehicles, ships and aircraft 2022-01-19 00:10:49 +00:00
Jonathan G Rennison
b23d394f0b Handle predictable conditional orders in timetable window 2022-01-15 15:57:09 +00:00
Jonathan G Rennison
b259d04339 Add tunnel/bridge entrance/exit values to entry direction conditional 2021-11-13 22:52:27 +00:00
Jonathan G Rennison
74bfe4e6d2 Allow placing routing restrictions on tunnel/bridge entrance/exit signals
No reserve through support
2021-11-13 22:28:14 +00:00
Jonathan G Rennison
dad007e16a Fix spelling of TRPRF_SPEED_RESTRICTION_SET 2021-11-13 02:00:37 +00:00
Jonathan G Rennison
1e0bea5b8d Replace FindFirstBit/FindFirstBit64 with a single template function 2021-11-01 23:00:44 +00:00
Jonathan G Rennison
53139c2405 Add current day/month to tracerestrict and conditional order conditionals 2021-10-26 23:39:40 +01:00
Jonathan G Rennison
b8d5113c5a Tracerestrict: Add slot action mode, try to acquire (only on reserve) 2021-08-15 22:39:52 +01:00
Jonathan G Rennison
1002c6d9d2 Fix various compiler warnings
See: #267
2021-06-11 22:54:27 +01:00
Jonathan G Rennison
0579c8755c Add tracerestrict action: No PBS signal back PF penalty 2021-05-25 18:50:36 +01:00
Jonathan G Rennison
112b235b71 Fix name prefix of TraceRestrictNewsControlField enum values 2021-05-25 18:21:24 +01:00
Jonathan G Rennison
2e28bc8e6a Tracerestrict: Add engine class conditional 2021-05-13 23:49:03 +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
aff89b61f5 Add tracerestrict reserved tiles ahead conditional 2021-02-13 03:29:35 +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
8a814bbfe3 Add release slot train order 2021-02-10 22:30:22 +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
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
270a748b64 Tracerestrict: Add time/date conditional 2020-11-27 18:43:32 +00:00
Jonathan G Rennison
72a7ae25e8 Tracerestrict: Fix program execution when skipping double non-conditional 2020-11-25 01:38:01 +00:00