Commit Graph

55953 Commits (59d5270a8c3342bf68c9dff091fb2dc83f542e59)
 

Author SHA1 Message Date
Patric Stout 59d5270a8c Fix b0e73277: save/load next_station for CargoPacket again
(cherry picked from commit 9e3763cfb3)
1 year ago
Patric Stout a38b072e4b Fix: don't compare next_station when trying to merge CargoPackets
For vehicle packets they shouldn't be compared, and for station
packets they are already in a bucket per next_station.

(cherry picked from commit 1243c331b6)
1 year ago
Patric Stout 4ee51442d2 Codechange: rename next_station to next_hop to avoid confusing with another next_station
(cherry picked from commit 9f8c1ea552)
1 year ago
Patric Stout 2037587c7c Codechange: remove parameter from VehicleCargoList::Reassign that is always INVALID_STATION
(cherry picked from commit a0f6983be4)
1 year ago
Patric Stout f5d685a525 Fix b0e73277: cargodist information got lost when splitting of cargo (#11280)
During b0e73277 we removed loaded_at_xy, but I kinda forgot that
it was a union with next_station. Now next_station wasn't copied
anymore, or checked in AreMergable.

(cherry picked from commit e6c02ebee6)
1 year ago
Patric Stout e5673a1756 Codechange: cleanup CargoPacket in terms of variable/function names (#11278)
Over the years, things got reused and changed, making the current
names somewhat unclear in what they actually mean and do.

(cherry picked from commit 30172fc037)
1 year ago
Patric Stout 2890127675 Codechange: remove loaded_at_xy from CargoPacket as it was unused (#11276)
(cherry picked from commit b0e73277d6)
1 year ago
PeterN 186a082613 Codechange: Reorder some high-use structs to reduce their size. (#11201)
This reduces GoodsEntry from 144 to 136 bytes (thereby reducing Station from 9704 bytes to 9192 bytes), and CargoPacket from 40 bytes to 32 bytes.

(cherry picked from commit bd150df914)
1 year ago
Patric Stout d17c949c22 Codechange: simplify the type of loaded_at_xy / next_station (#11182)
It was TileOrStationID, most likely to make sure both types in
the union are identical. But as TileIndex is a StrongTypeDef
that becomes a bit weird. So instead, still make sure they are
of equal size, but define their individual types better.

(cherry picked from commit c9c9cfa4fd)
1 year ago
Jonathan G Rennison e0e4d7c07e Saveload: De-duplicate handling of wrong length SLXI extra data 1 year ago
Jonathan G Rennison df4c458c29 Add savegame flag for station tile cache flags
Update flags as necessary on load and when reloading GRFs
1 year ago
Peter Nelson b2a1ec96f1 Change: Store station blocked/wires/pylons flags in map.
This stores three flags in unused map bits, and avoids having to look up
station graphics and custom station specs to determine blocked/wires/pylons
status.

This potentially affects rail pathfinding performance.

Savegame version is not bumped, as the flags can just be updated every
time.

(cherry picked from commit cb658e6cc6e1c114c1eaafaaa5b14849f04ca083)
1 year ago
Jonathan G Rennison e162e7a331 Translation: Fix simplified Chinese routing restriction PF penalty strings 1 year ago
Jonathan G Rennison 8a0fab1d4c Add setting for whether water floods from map edges 1 year ago
Jonathan G Rennison aa4aee1d23 Remove NOT_REACHED from Layouter::GetCharPosition
Return begin/end value for unknown code point index or out of range input

See: #596, #598, https://github.com/OpenTTD/OpenTTD/issues/11291
1 year ago
Jonathan G Rennison d4ed088498 Version: Committing version data for tag: jgrpp-0.55.3 1 year ago
Daniel Robinson ef91136633 Fix #10600: 'Replace Vehicles' didn't show numbers >999 (#10680)
(cherry picked from commit 71c2878799)
1 year ago
PeterN 3ef6eccf90 Fix #11230: Widget layout also failed for group-less vehicle list window. (#11310)
(cherry picked from commit 6580ff1adb)
1 year ago
Jonathan G Rennison 90192f9537 TBTR: Implement cost estimation for template replacement
Simplified operation, CMD_NO_TEST is still in use
1 year ago
Jonathan G Rennison 1e7f31b807 Fix conditional order wait loops not ignoring label orders 1 year ago
Jonathan G Rennison 9ad2f44ab7 Fix conditional order subtype not being reset when changing to time/date 1 year ago
arikover 81c66f79aa Fix d42a78f: Show correct road speed in construction dropdowns (#11196)
(cherry picked from commit 5d3f7939e2)
1 year ago
Jonathan G Rennison ad3980e596 Add setting for whether non-leading train engines keep custom names 1 year ago
Jonathan G Rennison 59ea48c541 Scheduled dispatch: Allow moving dispatch schedules in schedule list 1 year ago
PeterN df7fc5a79a Fix: #11329: Don't assert vehicle list length is non-zero when only asked to set string parameter. (#11330)
Since #11321, the vehicle list is not yet initialized when SetStringParameters is called, so a test that the vehicle list size is zero is triggered. However, doing this check in the SetStringParameters function is a bit out of its remit, so just remove it.

(cherry picked from commit 6d675c8acf)
1 year ago
Jonathan G Rennison 338dff09a7 Add chicken bit to allow test/exec mismatch for all commands 1 year ago
Jonathan G Rennison ed75592979 Fix crash attempting to remove sprite zoom level from empty entry 1 year ago
Jonathan G Rennison e1606934ae Ignore test/exec cmd mismatch in CmdDepotMassAutoReplace
Due to use of CmdTemplateReplaceVehicle
1 year ago
Jonathan G Rennison 579082a075 Add missing road/tram extra flags to dump road types console command 1 year ago
PeterN c2ef54525a Fix #11326: Update autoreplace scrollbar count after clearing engine list. (#11327)
(cherry picked from commit cef6a5f79c)
1 year ago
Jonathan G Rennison b70f8020e6 Fix right-click viewport scroll after using change viewport buttons
See: #597
1 year ago
Jonathan G Rennison d663c05a4f Version: Committing version data for tag: jgrpp-0.55.2 1 year ago
Jonathan G Rennison e04fe06a7b Fix window closing in HideDropDownMenu 1 year ago
Jonathan G Rennison 22a3a6d3c4 Add missing c_str() in font_osx.cpp 1 year ago
Jonathan G Rennison 06139c26a9 Add missing override specifiers to struct DropdownWindow 1 year ago
Jonathan G Rennison e5e1adad8a Fix graphical issues with scrolling viewport overlays 1 year ago
Jonathan G Rennison 290822d150 Update viewport positions in two stages 1 year ago
Jonathan G Rennison 96ed5b5cad Remove _vp_move_offs global 1 year ago
Jonathan G Rennison 57e4929137 Fix viewport sign invisibility check 1 year ago
Jonathan G Rennison 68c0fd63dd Avoid window iterations when marking viewports dirty 1 year ago
Jonathan G Rennison b93503bb21 Avoid window iterations when no windows of desired class present 1 year ago
Jonathan G Rennison 52e4688851 Use Window iterate instead of from front/back when no order required 1 year ago
Jonathan G Rennison cd2a368d77 Fix #11307: Incorrect GroupStatistics after selling leading wagon
When this results in a countable consist
1 year ago
Jonathan G Rennison f5d1b1d8f8 Change window close/deallocation to match upstream 1 year ago
Jonathan G Rennison 79cfc3e8bd Merge branch 'master' into jgrpp 1 year ago
Jonathan G Rennison a18f3274b4 Rename close window functions to match upstream 1 year ago
Jonathan G Rennison ed1b842ad3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console.cpp
#	src/console_func.h
#	src/network/network_server.cpp
#	src/os/unix/unix.cpp
#	src/spritecache.cpp
#	src/viewport.cpp
1 year ago
Loïc Guilloux cb5a132b0c Fix: marked text was not updated during text deletion (#11293)
(cherry picked from commit b4ff06b6ef)
1 year ago
Loïc Guilloux 4c4fe8cf64 Fix: IConsoleWindow:GetTextBoundingRect() is incorrect (#11292)
(cherry picked from commit 220f93f552)
1 year ago
Jonathan G Rennison 6be4708131 cpp-btreee: Fix alloc/dealloc size mismatch (struct padding)
Between new_leaf_node and delete_leaf_node
This is mostly harmless, but triggers AddressSanitizer

When alignof(value_type) is less than alignof(base_fields)
and kNodeValues * sizeof(value_type) is not an integral multiple
of alignof(base_fields), such that leaf_fields has padding
1 year ago