Commit Graph

57309 Commits

Author SHA1 Message Date
Jonathan G Rennison
cfebbfac8c Merge branch 'master' into jgrpp
# Conflicts:
#	src/autoreplace_cmd.cpp
#	src/company_base.h
#	src/company_gui.cpp
#	src/cpu.cpp
#	src/debug.h
#	src/group.h
#	src/group_cmd.cpp
#	src/house.h
#	src/industry.h
#	src/newgrf_house.cpp
#	src/news_type.h
#	src/openttd.cpp
#	src/saveload/company_sl.cpp
#	src/settings_type.h
#	src/sl/oldloader_sl.cpp
#	src/story.cpp
#	src/table/town_land.h
#	src/viewport.cpp
2024-02-09 18:50:49 +00:00
Jonathan G Rennison
e1d629dba3 Also use custom sprite sorting for catenary pylons under bridges 2024-02-09 01:30:17 +00:00
Jonathan G Rennison
a484a5eb77 Use custom sprite sorting rules for vehicles diagonally under bridges
Extend bb sprite south for comparisons, but only for vehicles underneath
This is to avoid creating sprite sorting problems for vehicles
on top of the bridge

Adjust ParentSpriteToDraw struct
2024-02-09 01:28:15 +00:00
Jonathan G Rennison
ea8aa47832 Add missing braces around calls to ViewportMapDraw in ViewportDoDraw 2024-02-08 18:26:51 +00:00
Jonathan G Rennison
9aa8059c79 Include elapsed state ticks since load in crash/failure logs
Consolidate game load date/time variables
2024-02-07 21:19:55 +00:00
Jonathan G Rennison
d456f4a3a5 Replace DATE_UNIT_SIZE macro with a function 2024-02-07 21:19:55 +00:00
Jonathan G Rennison
d39236d50c Store state ticks directly in savegame instead of the offset
Initialise the state ticks value to a constant for new games,
instead of using an implicit offset of 0
2024-02-07 20:05:11 +00:00
Jonathan G Rennison
0ea57528c9 Rename DateTicksScaled to StateTicks
Rename various other related/derived types and variables
2024-02-07 18:36:47 +00:00
Jonathan G Rennison
39b4772a34 Convert speed units in station rating tooltip
See: #645
2024-02-07 17:28:13 +00:00
Jonathan G Rennison
b6b665e989 Set GoodsEntry last_vehicle_type when resetting time_since_pickup 2024-02-07 17:22:21 +00:00
Jonathan G Rennison
e8c17f634b Remove randombytes from 3rdparty 2024-02-06 19:31:56 +00:00
Jonathan G Rennison
f966153ae2 Saveload: Remove use of randombytes in company passwords storage
Use RandomBytesWithFallback
Replace related key/data arrays with std::array
2024-02-06 19:17:57 +00:00
Jonathan G Rennison
9492aa1c0d Saveload: Add span overloads to ReadBuffer and MemoryDumper 2024-02-06 19:06:37 +00:00
Jonathan G Rennison
17712af318 Random: Try a little bit harder in the random bytes fallback path 2024-02-06 18:58:31 +00:00
Jonathan G Rennison
f44ec32011 Replace NetworkRandomBytesWithFallback with RandomBytesWithFallback
Replace related key/data arrays with std::array
2024-02-06 18:51:33 +00:00
Jonathan G Rennison
bb627e944c Serialisation: Add std::span wrappers for Recv_binary, Send_binary 2024-02-06 18:35:44 +00:00
Jonathan G Rennison
2208d70e33 Merge branch 'master' into jgrpp
# Conflicts:
#	src/3rdparty/monocypher/CHANGELOG.md
#	src/3rdparty/monocypher/CMakeLists.txt
#	src/3rdparty/monocypher/README.md
#	src/3rdparty/monocypher/monocypher.h
#	src/core/random_func.cpp
#	src/misc.cpp
2024-02-06 18:10:16 +00:00
Jonathan G Rennison
347862504f Fix rail toolbar layout when polyrail button hidden at init 2024-02-05 17:10:31 +00:00
Jonathan G Rennison
5b894edde8 Fix mismatch between struct Blitter and class Blitter declarations 2024-02-04 18:24:01 +00:00
Jonathan G Rennison
77772725be Version: Committing version data for tag: jgrpp-0.57.1 2024-02-04 17:28:34 +00:00
Jonathan G Rennison
b2b96fff13 Disable threaded rendering when showing widget outlines
Because these are drawn outside the window boundary, so it is not
technically thread-safe due to non-deterministic drawing order
2024-02-04 02:39:59 +00:00
Jonathan G Rennison
16589041f2 Prevent dragging plan lines across viewports
As this leads to erratic plans
2024-02-04 02:39:59 +00:00
Jonathan G Rennison
d4381d06ea Revert "Add scoped helper to temporarily override current blitter"
This reverts commit ae701a3bd8.
2024-02-04 02:00:45 +00:00
Jonathan G Rennison
4a9803c6f0 Do not override global blitter to render overlay/plans to cache buffer
Creates thread safety issues with active draw jobs
2024-02-04 01:41:04 +00:00
Jonathan G Rennison
816d4eb657 Fix ff0c77ee: Wrong pitch used to fill in scrolled plan/overlay caches 2024-02-04 01:41:04 +00:00
Jonathan G Rennison
3365efa5b2 Ensure that sprite aligner click to pick sprites is thread safe
Use a mutex for list of sprite IDs found in (threaded) draw jobs
2024-02-04 01:41:04 +00:00
Jonathan G Rennison
736539280b Fix second colour vehicle-type default liveries not being updated
When changing company default second colour
2024-02-03 23:11:49 +00:00
Jonathan G Rennison
ff0c77ee3b Blitter: Do not override global screen pitch to use 8bpp blitter
8bpp blitter keep a point to pitch (default screen pitch)
2024-02-03 22:00:21 +00:00
Jonathan G Rennison
539ca43525 Replace asserts with exits in GfxFillRect 2024-02-03 18:16:30 +00:00
kiwitreekor
16574946da Add: Station variable 6B to get extended station id of nearby tiles (#10953)
(cherry picked from commit 8d62a8f0f0)
2024-02-03 17:53:58 +00:00
Jonathan G Rennison
728971ddbc Road stops: Remove 0x6B as alias of roadstop_road_info_nearby_tiles 2024-02-03 17:52:28 +00:00
Jonathan G Rennison
28b156d95c Fix rounding of right edge of viewport mark dirty area
Could result in vehicles leaving pixels behind when moving left
2024-02-03 14:57:15 +00:00
Jonathan G Rennison
41299128e5 Explicitly cast time units when calculating wait time in LoadUnloadVehicle 2024-02-03 14:35:38 +00:00
Jonathan G Rennison
2941567c02 Fix leftover strings in Korean translation
See: #642
2024-02-03 12:21:06 +00:00
TELK
1174794c82 Update: Korean translation up to 0.57.0 2024-02-03 12:07:28 +00:00
Jonathan G Rennison
04fc0c37dc Crashlog: Tag image base with [[maybe_unused]] 2024-02-03 12:04:55 +00:00
Jonathan G Rennison
7d92f185d3 Fix picker tool item selection in rail/road station and waypoint windows 2024-02-03 12:02:58 +00:00
glx22
48c97d6cde Fix 48b6b18: Increase MAX_VALUATE_OPS to match the previous limit
(cherry picked from commit a502453033)
2024-02-03 11:40:11 +00:00
Jonathan G Rennison
66e57e6b2d Crashlog: Handle image relocation in MinGW BFD symbol lookup 2024-02-02 21:11:22 +00:00
Jonathan G Rennison
d00424008f Crashlog: Adjust Linux stacktrace format when using BFD 2024-02-02 21:11:22 +00:00
Jonathan G Rennison
a4c14171a7 Crashlog: Re-use BFD instances for the same object 2024-02-02 21:11:22 +00:00
Jonathan G Rennison
fcc6529b6a Ensure scroll count and engine list size match in build vehicle window 2024-02-02 18:24:53 +00:00
Jonathan G Rennison
860af4de29 Fix sort by total cargo in build ship window 2024-02-02 01:48:28 +00:00
Jonathan G Rennison
3886ea75a6 Picker tool: Add support for industries 2024-02-01 20:03:56 +00:00
Jonathan G Rennison
9f55550417 Multi-cargo ships: Sprite group cargo thresholds refer to entire ship 2024-02-01 18:48:07 +00:00
Jonathan G Rennison
47393b42dc VarAction2: Fix procedure calls being incorrectly eliminated
In the case where they were only referenced by substitution candidates
2024-02-01 18:17:04 +00:00
Jonathan G Rennison
000ae23eb2 VarAction2: Fix loads of temporary variable 0 not being tracked 2024-02-01 18:13:01 +00:00
Jonathan G Rennison
b49a38bf6c Fix build and refit with multi-cargo ships only refitting first part 2024-02-01 02:34:49 +00:00
Jonathan G Rennison
a5a315b55d Fix inconsistent order of ship running cost and capacity 2024-01-31 20:30:20 +00:00
Jonathan G Rennison
73bcd40776 Fix taking over a company using shares using the wrong news string
See: #637
2024-01-30 19:49:46 +00:00