Commit Graph

56586 Commits (c76a5ed638d58d8caaa2f349487053cce3567a0c)
 

Author SHA1 Message Date
Peter Nelson 2a88e0fab3 Codechange: Use bitmask instead of array for cargo consistency check.
We only need to know if a cargo type is accepted, not how much.
9 months ago
Jonathan G Rennison a1c6923c63
Fix: Assertion in sprite aligner window (#11371)
When clicking sprite number after re-opening window having previously used sprite picker tool
9 months ago
Loïc Guilloux ab805c4e9e
Fix #11375, 7c37dcb: Use STRING2 when the passed string can have 2 parameters (#11376) 9 months ago
Tyler Trahan f49ffaaaea
Fix e4fd99a, Fix #11270: Vehicle max age is not subject to leap years (#11372) 9 months ago
Jonathan G Rennison 39247b0120 Road stops: Add tile slope to varact2 variable 0x42 9 months ago
Peter Nelson 356a5d5773
Codechange: Use std::vector in fallback layouter, and shorten accessors. (#11355)
This avoids use of malloc/free (and custom move constructors), and follows how the exist layouters are written.
9 months ago
Jonathan G Rennison b9654985ad Fix crash in sprite aligner window
When clicking sprite number after re-opening window
having previously used sprite picker tool
9 months ago
translators 2be1b72a5b Update: Translations from eints
hungarian: 50 changes by Norodix
9 months ago
translators a73ef95a2b Update: Translations from eints
chinese (simplified): 5 changes by WenSimEHRP
9 months ago
Rubidium adad078b55 Fix #11367, 7c37dcb: use STRING1 when the passed string can have a parameter 9 months ago
Peter Nelson bdcf6b6acd Fix: Treat closing network relay window as a choice of "No".
Issue ConnectFailure when closing the window if the relay request is
considered unhandled.
9 months ago
Peter Nelson f379b31e28 Add: data parameter in Window::Close method.
This allows passing data when closing a window, e.g. to indicate how it was closed.
9 months ago
Peter Nelson cda6f24fe8
Change: Filter duplicate paths from valid search path list. (#11363) 9 months ago
Loïc Guilloux 0458c15060
Cleanup: [MacOS] Remove unneeded WITH_SDL checks (#11360) 9 months ago
Peter Nelson ac9db3f5aa
Codechange: Don't use bit-field in Yapf rail node. (#11362)
Compacting 3 booleans into 3 bits could save memory allocation, however this data is inside a union which also contains a 4-byte integer. As such this gives the cost penalty of a bit-field without any benefit.
9 months ago
translators 84201a8520 Update: Translations from eints
chinese (traditional): 80 changes by wpi3
chinese (simplified): 1 change by WenSimEHRP
9 months ago
Peter Nelson 2fd3d943aa
Fix 94167dfd: Don't shade the currently selected engine in autoreplace window. (#11354)
This breaks #7729 which specifically allows autoreplace of same engine types, and also did not work properly if the engine had been built during the current game session.
9 months ago
WenSimEHRP adbbbd14b6 Update simplified_chinese.txt 9 months ago
translators 89acfc7ff9 Update: Translations from eints
chinese (simplified): 1 change by WenSimEHRP
indonesian: 12 changes by liimee
9 months ago
Jonathan G Rennison e3ccc54670 Adjust setting text for departure board conditional order handling 9 months ago
Jonathan G Rennison cd091e04f5 Add settings filter to only show non-vanilla settings 9 months ago
Peter Nelson d1a94d75e1
Fix: Incorrect include path for timers. (#11351) 9 months ago
Jonathan G Rennison 0620026d56 Tracerestrict: Add long reserve (unless stopping) mode
Requires realistic braking
9 months ago
translators 7145b7060a Update: Translations from eints
romanian: 3 changes by bnegrut
9 months ago
Jonathan G Rennison b299c4dce8 Tracerestrict: Add enum type for TRIT_LONG_RESERVE values 9 months ago
merni-ns c794676928
Fix #10763, Fix #11168: Display variant groups that consist only of unavailable sub-groups (#11342) 9 months ago
Peter Nelson 5869f790d8
Fix: Check for engine variant loops during NewGRF initialization. (#11343)
Invalid NewGRFs could set up an engine variant loop that never ends. This
was checked for in some places that evaluated variants, but not all. In
most cases this would result in the engines not appearing, but could
potentially cause an infinite loop and crash.

Instead, during NewGRF initialization detect loops and remove invalid
variants before setting display flags.
9 months ago
merni-ns 077b08bbfa
Fix #11261: Set number of items correctly when choosing available airport set (#11344) 9 months ago
frosch 82c8720814 Fix #8846: When upgrading NewGRF presets, copy NewGRF parameters only if the NewGRF are compatible. Otherwise reset to defaults. 9 months ago
frosch d75a5e1a9a Fix: Upgrading NewGRF presets could result in incomplete display of NewGRF parameters until restart. 9 months ago
Patric Stout 4280c413a6 Fix: only count distance traveled in vehicles for cargo payment (#11283)
No longer you can utilize the free (and instant) labour of station
workers, transporting your cargo from one part of the station to
the other. No more!

Based on patch by dP.

(cherry picked from commit df400ef84a)
9 months ago
Patric Stout 05c35c8e31 Fix: base cargo payment on load/unload tile, instead of station sign location (#11281)
(cherry picked from commit 9c49a61249)
9 months ago
Patric Stout a15847cf4f Codechange: simplify splitting of CargoPacket (#11286)
(cherry picked from commit d1a0ca67be)
9 months ago
Patric Stout 59d5270a8c Fix b0e73277: save/load next_station for CargoPacket again
(cherry picked from commit 9e3763cfb3)
9 months 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)
9 months ago
Patric Stout 4ee51442d2 Codechange: rename next_station to next_hop to avoid confusing with another next_station
(cherry picked from commit 9f8c1ea552)
9 months ago
Patric Stout 2037587c7c Codechange: remove parameter from VehicleCargoList::Reassign that is always INVALID_STATION
(cherry picked from commit a0f6983be4)
9 months 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)
9 months 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)
9 months ago
Patric Stout 2890127675 Codechange: remove loaded_at_xy from CargoPacket as it was unused (#11276)
(cherry picked from commit b0e73277d6)
9 months 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)
9 months 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)
9 months ago
translators c84219a42e Update: Translations from eints
english (us): 1 change by 2TallTyler
vietnamese: 21 changes by KhoiCanDev
9 months ago
Jonathan G Rennison e0e4d7c07e Saveload: De-duplicate handling of wrong length SLXI extra data 9 months ago
Jonathan G Rennison df4c458c29 Add savegame flag for station tile cache flags
Update flags as necessary on load and when reloading GRFs
9 months 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)
9 months ago
Peter Nelson b5dc9328f2
Change: Store station blocked/wires/pylons flags in map. (#11337)
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.
9 months ago
Jonathan G Rennison e162e7a331 Translation: Fix simplified Chinese routing restriction PF penalty strings 9 months ago
Jonathan G Rennison 8a0fab1d4c Add setting for whether water floods from map edges 9 months ago
translators fd79d34ba9 Update: Translations from eints
korean: 1 change by telk5093
9 months ago