dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,317 Commits 1 Branch 0 Tags
85e1146fab19c61425637e033508d4920740d5cc
Commit Graph

56317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PeterN
acd7d3c913 Codechange: Rename *Railtype* to *RailType* for consistency. (#11287) 2023-09-11 08:55:12 +00:00
PeterN
a0b2f28f9c Codechange: Use std::copy/fill pattern to initialize rail and road specs. (#11285) 
This avoids use of lengthof and array indices.
 2023-09-10 23:01:08 +00:00
Patric Stout
7e3cdbaf62 Fix: mark next_station as INVALID_STATION when loading from older savegames 2023-09-11 00:25:47 +02:00
Patric Stout
9e3763cfb3 Fix b0e73277: save/load next_station for CargoPacket again 2023-09-11 00:25:47 +02:00
Patric Stout
1243c331b6 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.
 2023-09-11 00:25:47 +02:00
Patric Stout
9f8c1ea552 Codechange: rename next_station to next_hop to avoid confusing with another next_station 2023-09-11 00:25:47 +02:00
Patric Stout
a0f6983be4 Codechange: remove parameter from VehicleCargoList::Reassign that is always INVALID_STATION 2023-09-11 00:25:47 +02:00
PeterN
89b84222d3 Fix: NewGRF house class mappings were not reset between games. (#11279) 
(cherry picked from commit 6643c010bd)
 2023-09-10 20:50:57 +01:00
Michael Lutz
1637f6f6b0 Feature: [NewGRF] Related Act2 objects for airports and airport tiles. 
Airports are similar two stations and industries, both of which have the town as related object.
Airport tiles are similar to industry tiles, which have the industry as related object.
This seems a sensible structure, so let's make it Airport Tile -> Airport -> Town.

(cherry picked from commit 1c620b349f)
 2023-09-10 20:50:57 +01:00
Michael Lutz
5cc623cb3c Add: [NewGRF] Inspection window for airports. 
As as the station window combines all station types, accessing the
debug view is via the parent of the airport tile only.

(cherry picked from commit a6f2f3c042)
 2023-09-10 20:50:57 +01:00
PeterN
6643c010bd Fix: NewGRF house class mappings were not reset between games. (#11279) 2023-09-10 18:55:37 +01:00
Michael Lutz
1c620b349f Feature: [NewGRF] Related Act2 objects for airports and airport tiles. 
Airports are similar two stations and industries, both of which have the town as related object.
Airport tiles are similar to industry tiles, which have the industry as related object.
This seems a sensible structure, so let's make it Airport Tile -> Airport -> Town.
 2023-09-10 19:38:18 +02:00
Michael Lutz
a6f2f3c042 Add: [NewGRF] Inspection window for airports. 
As as the station window combines all station types, accessing the
debug view is via the parent of the airport tile only.
 2023-09-10 19:38:18 +02:00
Jonathan G Rennison
f6eadf19c6 Replace vehicle tile hash 
Use robin hood hash of TileIndex
Retain linked list of vehicles on the same tile
 2023-09-10 16:19:19 +01:00
Jonathan G Rennison
b09894db4f Show total cargo packets in dump_cpdp_stats console command output 2023-09-10 16:19:19 +01:00
Patric Stout
e6c02ebee6 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.
 2023-09-10 15:20:58 +02:00
Jonathan G Rennison
c6ce9ce687 Add road vehicle flags for whether any part is on level crossing 2023-09-10 13:43:13 +01:00
Tyler Trahan
701a61c9af Codechange: Delete date_type.h 2023-09-10 08:40:25 -04:00
Tyler Trahan
77173a6a10 Codechange: Move date consts and functions to CalendarTime and TimerGameCalendar classes 2023-09-10 08:40:25 -04:00
Tyler Trahan
fca2b37726 Codechange: Move Ticks into their own class 2023-09-10 08:40:25 -04:00
Jonathan G Rennison
18a40df10e Adjust types in EnumCheckRoadVehClose 2023-09-10 12:44:22 +01:00
Patric Stout
30172fc037 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.
 2023-09-09 23:21:21 +02:00
Patric Stout
b0e73277d6 Codechange: remove loaded_at_xy from CargoPacket as it was unused (#11276) 2023-09-09 20:24:46 +01:00
Peter Nelson
f3b4f9d640 Codechange: Reduce size of TextEffectMode and TextEffectID. 
TextEffectID was promoted to size_t in #9235, when it was used in loops.
However since then the relevant code uses range-for or iterators instead.
 2023-09-09 19:26:47 +01:00
Peter Nelson
f6939d6c4d Codechange: Make INVALID_TE_ID a TextEffectID instead of a TextEffectMode. 
Type-correctness?
 2023-09-09 19:26:47 +01:00
Peter Nelson
3c61c642a9 Codechange: Don't allocate a text effect with INVALID_TE_ID. 
Previously, despite INVALID_TE_ID existing, it was not checked during allocation and there was no limit to the number of text effects.
 2023-09-09 19:26:47 +01:00
Peter Nelson
78b841d14e Codechange: Take reference to text effect instead of pointer when updating. 2023-09-09 19:26:47 +01:00
Peter Nelson
7519f7ad79 Codechange: Use std::find_if to find or assign a text effect slot. 
This replaces an index-based loop.
 2023-09-09 19:26:47 +01:00
Peter Nelson
7bd019df90 Codechange: Use std::array for TemporaryStorageArray. 
This removes the need for initialisation with memset().
 2023-09-09 15:26:03 +01:00
Peter Nelson
9040d7813d Codechange: Use std::array and std::unique_ptr for PersistentStorageArrays. 
This (mostly) avoids the need for manual memory management and copying.
 2023-09-09 15:26:03 +01:00
Patric Stout
c3918838f6 Fix: crash when opening a damaged base-graphics (#11275) 2023-09-09 14:06:00 +00:00
PeterN
afc1ea8135 Codechange: Using alias and std::array for company expense storage. (#11273) 
This simplifies passing yearly expenses to functions and use of std algorithms.
 2023-09-09 13:15:53 +00:00
Patric Stout
00f13282a9 Codechange: keep how we convert string <-> JSON private (#11269) 2023-09-08 19:03:10 +02:00
Patric Stout
d725fa14a2 Fix: asserts unintentially being partially disabled in release-builds (#11268) 
The nlohmann-json header file includes assert.h, which rudely resets
the assert macro to what that header thinks is right. As we set the
assert macro to be active with release builds when WITH_ASSERT is
active, this means that every file including nlohmann-json has their
asserts disabled (for release-builds) but files that don't do no.

Let's avoid this issue, by telling nlohmann to not include assert.h.
 2023-09-08 10:11:37 +00:00
Rubidium
8c742b456f Codechange: use Textbuf directly, instead via several virtual functions in Window 2023-09-06 23:07:04 +02:00
Peter Nelson
7cc1ed9594 Codechange: Allow using more than 65536 NewGRF string IDs. 
NewGRF string allocation allowed up to 524288 strings, however stringid was passed as uint16_t which limits to 2^16.

(cherry picked from commit e4613fc04c)
 2023-09-06 21:56:20 +01:00
Peter Nelson
2178ff1e80 Change: Replace fixed length _grf_text array with vector. 
Additionally reshuffle GRFTextEntry for better alignment.

This removes a mostly-unused static 20MB allocation.

(cherry picked from commit 3e762af2d1)
 2023-09-06 21:56:20 +01:00
Jonathan G Rennison
0316940fe8 Fix: Inaccurate waiting cargo total in station window when using cargodist (#11213) 
For stations with many flows and/or small cargo packets,
due to accumulated inaccuracies in DivideApprox.

The displayed total should match GoodsEntry::TotalCount().
 2023-09-06 21:36:26 +02:00
Loïc Guilloux
21bd5fb991 Fix: [CI] preview flow can't install latest version of npm (#11265) 2023-09-06 16:29:34 +00:00
Patric Stout
5f9b8aaa95 Codechange: [Script] use nlohmann for Squirrel <-> JSON conversion (#11251) 2023-09-06 13:14:12 +02:00
translators
6e8d7964ed Update: Translations from eints 
english (us): 4 changes by 2TallTyler
 2023-09-05 18:38:17 +00:00
Jonathan G Rennison
85b20068a8 Merge PR #595 into jgrpp 2023-09-05 18:40:47 +01:00
Jonathan G Rennison
6f75465800 Fix 2f692a79: Dest ptr not advanced for BM_BLACK_REMAP in 32bpp optimised blitter 2023-09-05 18:37:50 +01:00
pvillaverde
f4ad08200e 🌐 Update Galician Translations up to 0.55.1 2023-09-05 17:35:07 +02:00
Jonathan G Rennison
d0fb85a5db Version: Committing version data for tag: jgrpp-0.55.1 2023-09-05 01:34:37 +01:00
Jonathan G Rennison
a48a3ac07b Fix 87911bdf: Fix FindLastBit for unsigned long long (uint64 on Windows) 
See: #594
 2023-09-05 00:39:44 +01:00
Jonathan G Rennison
20ece8025e Test: Add tests for FindLastBit function 2023-09-04 23:42:42 +01:00
Jonathan G Rennison
94cffc0aea Fix autorenew ship purchase cost not being applied for multi-cargo ships 2023-09-04 23:33:01 +01:00
translators
9d2920e9c5 Update: Translations from eints 
french: 2 changes by ottdfevr
 2023-09-04 18:38:09 +00:00
Patric Stout
337b7b0c63 Fix 8c9ecde9: actually remove autosave_interval from setting window (#11260) 2023-09-04 11:18:47 +00:00