Jonathan G Rennison
bea66c4beb
Fix minor code style issue
2024-06-30 19:12:08 +01:00
Jonathan G Rennison
fc6a7a12cf
Fix signal blocks containing no-entry signals not being promoted to PBS
2024-06-18 18:45:00 +01:00
Jonathan G Rennison
1a6a4c9a6c
Fix path-only signal cycle mode being ignored when using realistic braking
2024-04-05 17:54:21 +01:00
Jonathan G Rennison
7e0acd686e
Add NewGRF signal style flag to draw on both sides
2024-02-27 19:18:50 +00:00
Jonathan G Rennison
fdd666f66a
Merge tag '14.0-beta1' into jgrpp
...
# Conflicts:
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/aircraft.h
# src/animated_tile.h
# src/base_consist.h
# src/cargotype.h
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/engine_gui.cpp
# src/industry_gui.cpp
# src/lang/english.txt
# src/music/extmidi.cpp
# src/network/core/network_game_info.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_industries.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/order_type.h
# src/os/macosx/misc_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_gui.cpp
# src/rail_gui.h
# src/roadveh.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/script/api/script_town.cpp
# src/settingsgen/settingsgen.cpp
# src/ship.h
# src/ship_cmd.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen.h
# src/table/settings/script_settings.ini
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_cmd.h
# src/town_gui.cpp
# src/train.h
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/waypoint_base.h
# src/widget.cpp
2024-02-18 22:22:29 +00:00
frosch
b1718478c8
Codechange: Replace old non-standard attributes with C++17/20 standard attributes.
2024-02-02 22:29:28 +01:00
Jonathan G Rennison
5404be172c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/bitmath_func.cpp
# src/core/bitmath_func.hpp
# src/core/geometry_type.hpp
# src/game/game_text.hpp
# src/graph_gui.cpp
# src/pathfinder/npf/npf.cpp
# src/script/api/script_text.cpp
# src/spritecache.cpp
# src/track_func.h
2024-01-25 22:36:01 +00:00
Rubidium
8faaedeff9
Codechange: replace hand written function to find first/last bit with C++ variant
2024-01-19 21:10:39 +01:00
Jonathan G Rennison
0df59defc4
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release-linux.yml
# .github/workflows/release.yml
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/script/api/script_rail.cpp
# src/settings_gui.cpp
# src/signal_type.h
# src/video/sdl2_v.cpp
2024-01-16 01:15:58 +00:00
Jonathan G Rennison
97e6f3062e
Adding of _t to (u)int types, and WChar to char32_t
...
See: eaae0bb5e
2024-01-07 17:20:41 +00:00
Jonathan G Rennison
f3614c419d
Fix savegames with incorrect signal always reserve through bits
...
See: #620
2023-12-30 15:16:25 +00:00
Jonathan G Rennison
6ccd097d94
Don't maintain unused new signal style mappings when there are no signals
...
(Except for network clients)
Avoid unnecessary style remapping and signal recalculation operations
2023-12-05 18:21:42 +00:00
Jonathan G Rennison
4f8a7382ca
Ensure new signal style mapping array is zero-inited
2023-12-05 17:55:03 +00:00
Jonathan G Rennison
c929f7075e
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/SourceList.cmake
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/depot_base.h
# src/elrail.cpp
# src/network/core/udp.cpp
# src/network/network_admin.cpp
# src/network/network_chat_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/newgrf_railtype.cpp
# src/newgrf_railtype.h
# src/newgrf_storage.h
# src/os/unix/crashlog_unix.cpp
# src/rail.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_cmd.cpp
# src/road_map.h
# src/saveload/labelmaps_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/sl/oldloader_sl.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/table/settings/world_settings.ini
# src/tests/test_script_admin.cpp
# src/textfile_gui.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle_gui.cpp
# src/widget.cpp
# src/window.cpp
# src/window_gui.h
# src/window_type.h
2023-11-19 13:00:21 +00:00
Jonathan G Rennison
1183476182
Allow custom signal styles to disable aspect-limited mode
...
By setting style_lookahead_extra_aspects to 255
2023-08-14 23:56:21 +01:00
Jonathan G Rennison
4ec6a99dd8
Add GetTileTrackStatus wrapper for when red signals part is not needed
2023-03-04 02:01:40 +00:00
Jonathan G Rennison
7e452d6341
Normal/shunt mode signals default to shunt mode for depot routes
2022-10-15 17:21:28 +01:00
Jonathan G Rennison
9ee3bf7fcf
Fix normal/shunt signal mode with intermediary shunt signals
2022-10-15 17:20:50 +01:00
Jonathan G Rennison
edd8b29794
Don't trigger signal state/style desync message in GM_MENU mode
...
This occurs when loading a network savegame fails and the menu
game is reloaded
2022-08-27 21:59:40 +01:00
Jonathan G Rennison
bd28d5a239
Use order state at reservation time for signal mode tracerestrict eval
2022-07-01 00:33:59 +01:00
Jonathan G Rennison
a5fb39b388
Use shunt for combined shunt/normal for routes into a bay with shunt exit
2022-06-30 22:19:36 +01:00
Jonathan G Rennison
c19bd4473f
Add signal style flag to require realistic braking
2022-06-30 21:20:43 +01:00
Jonathan G Rennison
e399853f2c
Fix aspect propagation issues with combined shunt/normal signals
2022-06-29 23:28:53 +01:00
Jonathan G Rennison
e6a6b50675
Include signal combined/normal style mask in aspect cfg hash
2022-06-28 18:18:42 +01:00
Jonathan G Rennison
1422cc871c
Fix signal aspect re-calculation in bidi signal blocks with no junctions
2022-06-28 18:18:16 +01:00
Jonathan G Rennison
e747f96c78
Fix signal aspect re-calculation with combined normal/shunt
2022-06-28 18:17:55 +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
78ae295dfe
Add combined normal and shunt aspect signal style flag
2022-06-27 18:51:26 +01:00
Jonathan G Rennison
fa89036a27
Add function to get maximum signal aspect
2022-06-25 23:45:50 +01:00
Jonathan G Rennison
04da11b668
Store signal style GRF to local map in savegame
...
Update existing signal style IDs as necessary
2022-06-25 14:33:47 +01:00
Jonathan G Rennison
2f7664fc93
Move signal style mask variables into a single struct
2022-06-25 10:18:48 +01:00
Jonathan G Rennison
a311f12615
Add signals_style_lookahead_single_signal_only signal style property
2022-06-25 01:29:08 +01:00
Jonathan G Rennison
fcae909839
Add signal style flag for drawing on the opposite side
2022-06-22 23:45:44 +01:00
Jonathan G Rennison
175c5d4d50
Add signal style flag to limit lookahead extra aspect
2022-06-19 12:46:56 +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
7ae06124ae
Add signal style flag for no aspect increase behaviour (banner repeater)
2022-06-19 02:08:38 +01:00
Jonathan G Rennison
d56f7e7060
Fix wrong signal aspects when track built up to rear of tunnel/bridge entrance
2022-01-08 21:35:26 +00:00
Jonathan G Rennison
25a467730e
Fix signals on approach to tunnel/bridge entrance showing wrong aspect
...
When signal change propagated outward from the tunnel/bridge,
such as in tunnel/bridge signal add/change.
2021-11-16 02:49:44 +00:00
Jonathan G Rennison
62afd94b47
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/company_cmd.cpp
# src/economy.cpp
# src/lang/swedish.txt
# src/network/network_command.cpp
# src/news_gui.cpp
# src/saveload/saveload.h
# src/script/api/script_list.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/sdl2_v.cpp
2021-11-01 18:54:43 +00:00
Jonathan G Rennison
5be32627b7
Fix extra aspects variable not being set for newly generated maps
2021-09-12 17:36:47 +01:00
Jonathan G Rennison
5d351a14d2
Add new signal type: no-entry signal
...
This is only passable in one direction, but does not have a signal
or show an aspect in the opposite direction
Add a setting for whether this is shown in the signal UI.
Off by default.
2021-09-04 11:39:54 +01:00
Jonathan G Rennison
b08cc3cf38
Reduce screen re-draw area for tunnel/bridge end signal updates
2021-08-30 03:09:30 +01:00
Jonathan G Rennison
f6c2a81f72
Reduce screen re-draw area for bridge middle signal updates
2021-08-30 01:46:40 +01:00
Jonathan G Rennison
50f1c25ff5
Fix redrawing of bridge signals more than 2 middle signals need updating
...
On exit signal aspect change, with 5+ aspect signalling
2021-08-30 01:00:32 +01:00
Jonathan G Rennison
b2ef6c0de8
Add implementation of multi-aspect signalling and GRF support
...
Requires realistic braking
See: #247
2021-08-28 12:54:18 +01:00
Jonathan G Rennison
55c4fe7d45
Add helper functions to get tunnel/bridge entrance/exit trackdirs
2021-08-27 23:39:20 +01:00
Jonathan G Rennison
13603cb8e1
Block signals into blocks with junctions now default to red with realistic braking
2021-08-24 17:30:06 +01:00
Rubidium
281a65b3e1
Cleanup: simplify some boolean expressions
2021-06-17 16:18:30 +02:00
rubidium42
55a11710a6
Codechange: convert printf DEBUG statements to fmt Debug statements
2021-06-13 12:45:45 +02:00
Jonathan G Rennison
1002c6d9d2
Fix various compiler warnings
...
See: #267
2021-06-11 22:54:27 +01:00
