dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,081 Commits 1 Branch 0 Tags
ed59f6a8b91820b224e76e893418b61c40f2f145
Commit Graph

57081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patric Stout
ba67f39db6 Codechange: vendor the nlohmann-json library (#11290) 2023-09-13 16:11:34 +02:00
Niels Martin Hansen
41de0d46f3 Feature: Help and manuals access window 2023-09-13 16:11:08 +02:00
Niels Martin Hansen
2cff43251e Add: Install additional documentation files with the game 
Also include it in Emscripten packages
 2023-09-13 16:11:08 +02:00
Niels Martin Hansen
4765d0f8c2 Change: Text Layouter support querying all lines for character at pixel 2023-09-13 16:11:08 +02:00
Patric Stout
d1a0ca67be Codechange: simplify splitting of CargoPacket (#11286) 2023-09-13 09:40:01 -04:00
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
 2023-09-12 23:25:14 +01:00
Jonathan G Rennison
c8817d7f4e Merge branch 'master' into jgrpp 
# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h
 2023-09-12 20:06:47 +01:00
translators
a16aa3ef7d Update: Translations from eints 
swedish: 1 change by joeax910
 2023-09-12 18:38:00 +00:00
Jonathan G Rennison
3e3e083770 Merge branch 'master' into jgrpp 
Hostile takeover feature

# Conflicts:
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/economy.cpp
#	src/script/api/script_event_types.cpp
 2023-09-12 19:04:03 +01:00
Jonathan G Rennison
1b61dfabe3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_gui.cpp
#	src/core/math_func.hpp
#	src/highscore.cpp
#	src/tests/math_func.cpp
 2023-09-12 18:25:49 +01:00
Jonathan G Rennison
627eb1effc Fix multiplayer desync when adding a track piece of a different railtype 
Undoing a CMD_CONVERT_RAIL did not undo changes to the
infrastructure totals
Defer CMD_CONVERT_RAIL until all checks have succeeded instead

In the case where:
* The addition would have resulted in the tile changing railtype
* The addition fails because of slope restrictions, a train is present,
  or auto-removing signals fails
* The command test did not fail (e.g. because the train has moved)
 2023-09-11 23:40:34 +01:00
Jonathan G Rennison
56ecbb5574 Add missing flags in build/remove rail command comments 2023-09-11 23:09:27 +01:00
Patric Stout
b389d45d55 Doc: Add more hyperlinks within the included documentation (#11288) 
Co-authored-by: Niels Martin Hansen <nielsm@indvikleren.dk>
 2023-09-11 18:55:23 +00:00
translators
3fd50c2949 Update: Translations from eints 
swedish: 2 changes by optiedev
vietnamese: 11 changes by KhoiCanDev
romanian: 5 changes by bnegrut
danish: 2 changes by bscargo
dutch: 2 changes by Afoklala
portuguese: 2 changes by azulcosta
polish: 15 changes by pAter-exe
 2023-09-11 18:38:29 +00:00
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