dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,143 Commits 1 Branch 0 Tags
cb1e41fc88d7ce7e6e5202369209a84c62484c0f
Commit Graph

150 Commits

Author SHA1 Message Date
Jonathan G Rennison
1f5b35fac4 Change link graph join and compression times to use scaled tick counter 2024-02-15 02:05:27 +00:00
Jonathan G Rennison
7ce06e22b8 Split date types into calendar and economy dates 
See: 735abfe1
 2024-02-13 21:34:09 +00:00
Jonathan G Rennison
7460e73252 SaveLoad: Fix crash when joining network server which used GRF custom town zones 2024-02-12 23:08:01 +00:00
Jonathan G Rennison
903adceab5 Maintain map of targeted road vehicles to small UFO disaster vehicle 2024-02-12 00:48:13 +00:00
Jonathan G Rennison
1e2834a422 Use upstream/table format for game log chunk 2024-02-11 16:34:03 +00:00
Jonathan G Rennison
b05738284b Windows: Avoid destruction of unjoined std::thread on ExitProcess 
See: #649
 2024-02-11 02:03:33 +00:00
Jonathan G Rennison
11f75933bf Saveload: Use table format for DATE, VIEW, MAPS chunks 
Merge MISC into DATE
 2024-02-10 21:14:22 +00:00
Jonathan G Rennison
195b3b6d1d Saveload: Add initial table chunk support to non-upstream save backend 2024-02-10 21:11:27 +00:00
Jonathan G Rennison
5aaff39164 Fix wrong saveload types for std::string 2024-02-10 19:57:57 +00:00
Jonathan G Rennison
60e59a8233 Saveload: Add wrapper to simplify conditionally upstream chunks 
Where they're always saved as upstream and conditional on a feature
 2024-02-10 16:58:48 +00:00
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
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
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
9bea1e3cc3 Scheduled dispatch: Allow tagging departure slots, add to conditional order 2024-01-28 17:14:03 +00:00
Jonathan G Rennison
6c329871f1 Scheduled dispatch: Add per dispatch slot flags field 
Add flag for slot re-use
 2024-01-28 01:48:54 +00:00
Jonathan G Rennison
1edc828b76 Pre-filter object descriptors in order save/load 2024-01-28 00:38:22 +00:00
Jonathan G Rennison
bd51b1b69a Remove pre-init of static vector in train speed adaptation map save/load 2024-01-28 00:08:52 +00:00
Jonathan G Rennison
5b052ff91a Avoid truncation when calculating AircraftCache::cached_max_range_sqr 2024-01-27 20:03:46 +00:00
Jonathan G Rennison
1ce8930583 Use DateTicksScaled for Vehicle::last_loading_tick 2024-01-27 16:38:27 +00:00
Jonathan G Rennison
822ecae85d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/cargotype.h
#	src/core/CMakeLists.txt
#	src/core/span_type.hpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/misc/endian_buffer.hpp
#	src/misc_gui.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/string_func.h
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
 2024-01-25 18:37:23 +00:00
Jonathan G Rennison
5b7689a0aa Scheduled dispatch: Add flag to re-use all dispatch slots 2024-01-22 01:35:04 +00:00
Jonathan G Rennison
d62ae41e03 Tracerestrict: Remove TRSCOF_ACQUIRE_TRY_ON_RESERVE, same as TRSCOF_ACQUIRE_TRY 2024-01-20 22:49:55 +00:00
Jonathan G Rennison
fc51491361 Tracerestrict: Use combined aux and cond op fields for TRIT_SLOT subtype 2024-01-20 22:43:53 +00:00
Rubidium
5c5057e0fc Fix #11801, 51f1e93: CalcClosestTownFromTile needs the kd-tree to be valid 
(cherry picked from commit 4cc97e04e6)
 2024-01-18 00:14:39 +00:00
Jonathan G Rennison
1e0bb019a7 Change cargo scaling settings to be linear instead of logarithmic 2024-01-16 18:02:34 +00:00
Jonathan G Rennison
0df59defc4 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-linux.yml
#	.github/workflows/release.yml
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/script/api/script_rail.cpp
#	src/settings_gui.cpp
#	src/signal_type.h
#	src/video/sdl2_v.cpp
 2024-01-16 01:15:58 +00:00
Jonathan G Rennison
82d32fe40c Fix AllocateMap call for TTO savegames 2024-01-15 21:34:39 +00:00
Jonathan G Rennison
a6b467cf45 Fix road/tram type load check for savegame versions before 62 2024-01-15 19:37:54 +00:00
Jonathan G Rennison
041f36d565 Add try to acquire slot order subtype 2024-01-11 21:04:49 +00:00
Jonathan G Rennison
3050620189 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/autoreplace_cmd.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.cpp
#	src/economy.cpp
#	src/engine_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/newgrf.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_func.h
#	src/order_gui.cpp
#	src/pathfinder/pathfinder_type.h
#	src/saveload/afterload.cpp
#	src/subsidy_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
 2024-01-11 17:55:16 +00:00
Jonathan G Rennison
936d636cdd No longer save/load water region invalidation states 
Move InitializeWaterRegions to AllocateMap
No longer ForceUpdate in InitializeWaterRegions
 2024-01-10 00:51:44 +00:00
Jonathan G Rennison
914b92b21f Merge branch 'master' into jgrpp 
Bump savegame for water regions for ship pathfinder
Use ring_buffer for ShipPathCache
 2024-01-09 18:36:47 +00:00
Jonathan G Rennison
16b840d86e Increase DateTicks to 64 bits, fix overflow after year 79455 2024-01-09 00:13:28 +00:00
Jonathan G Rennison
97e6f3062e Adding of _t to (u)int types, and WChar to char32_t 
See: eaae0bb5e
 2024-01-07 17:20:41 +00:00
Jonathan G Rennison
55d78a23be Merge branch 'master' into jgrpp 
# Conflicts:
#	src/3rdparty/squirrel/include/squirrel.h
#	src/blitter/32bpp_sse_func.hpp
#	src/bridge_map.h
#	src/clear_map.h
#	src/company_manager_face.h
#	src/console_func.h
#	src/core/bitmath_func.hpp
#	src/core/endian_func.hpp
#	src/core/random_func.hpp
#	src/depot_map.h
#	src/elrail_func.h
#	src/fontcache.h
#	src/industry_map.h
#	src/map_func.h
#	src/newgrf_spritegroup.h
#	src/object_map.h
#	src/rail.h
#	src/rail_map.h
#	src/road_func.h
#	src/road_map.h
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/sl/oldloader.h
#	src/sprite.h
#	src/spritecache.h
#	src/station_func.h
#	src/station_map.h
#	src/story_base.h
#	src/strings_func.h
#	src/tile_cmd.h
#	src/tile_map.h
#	src/tile_type.h
#	src/town.h
#	src/town_map.h
#	src/tree_map.h
#	src/tunnel_map.h
#	src/tunnelbridge_map.h
#	src/vehicle_func.h
#	src/viewport_func.h
#	src/void_map.h
#	src/water.h
#	src/water_map.h
#	src/widget_type.h
 2024-01-07 15:00:16 +00:00
Jonathan G Rennison
f034714559 Use StringBuilder for GetString/GetStringWithArgs, as per upstream 
Update dependent code as required
 2024-01-05 21:12:54 +00:00
Jonathan G Rennison
7f6b1d6b94 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_cmd.cpp
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/script/api/script_depotlist.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini
 2024-01-05 13:37:52 +00:00
Jonathan G Rennison
42c8f50551 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	.github/workflows/release-windows.yml
#	.gitignore
#	COMPILING.md
#	src/company_gui.cpp
#	src/date_gui.cpp
#	src/engine.cpp
#	src/engine_func.h
#	src/fileio.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf_debug_gui.cpp
#	src/newgrf_gui.cpp
#	src/order_gui.cpp
#	src/osk_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/script/api/script_event_types.hpp
#	src/sl/oldloader_sl.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_func.h
#	src/widgets/dropdown_type.h
#	src/widgets/group_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
#	src/window_gui.h
#	src/window_type.h
 2024-01-02 14:44:33 +00:00
Jonathan G Rennison
f3614c419d Fix savegames with incorrect signal always reserve through bits 
See: #620
 2023-12-30 15:16:25 +00:00
Jonathan G Rennison
ae1729fa50 Network: Include town noise levels in network game saves 
Don't recalculate on load for network clients
 2023-12-26 20:04:21 +00:00
Jonathan G Rennison
2e9cb16254 Saveload: Simplify list handling in SlRefList 
Use reserve on load if suitable
 2023-12-26 18:18:00 +00:00
Jonathan G Rennison
d5a7a67b8c Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/ci-build.yml
#	src/ai/ai_gui.cpp
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/32bpp_simple.cpp
#	src/blitter/32bpp_sse2.cpp
#	src/blitter/8bpp_optimized.cpp
#	src/blitter/8bpp_simple.cpp
#	src/blitter/null.cpp
#	src/blitter/null.hpp
#	src/company_gui.cpp
#	src/game/game_gui.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/graph_gui.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/network/network_gui.cpp
#	src/newgrf_debug_gui.cpp
#	src/openttd.cpp
#	src/pathfinder/npf/aystar.h
#	src/road_gui.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/script/script_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/sortlist_type.h
#	src/spritecache.cpp
#	src/spriteloader/grf.cpp
#	src/spriteloader/grf.hpp
#	src/spriteloader/spriteloader.hpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_gui.cpp
#	src/strings.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/video/opengl.cpp
#	src/video/opengl.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window_gui.h
 2023-12-23 13:26:55 +00:00
Jonathan G Rennison
378a545dd4 Add setting for map edge behaviour, and how to display area outside map 2023-12-22 17:32:44 +00:00
Jonathan G Rennison
4689113553 Debug: De-duplicate formatting of hex dates for desync/random logging 2023-12-19 17:55:57 +00:00
Jonathan G Rennison
03e0ec8276 Strong typedef: Use strong typedefs for date, date tick, minutes types 
Add delta types
Adjust/add type conversion functions
Add various utility methods on types
Remove the various minute macros
Fix some minute conversion inconsistencies
 2023-12-19 02:39:54 +00:00
Jonathan G Rennison
4fac6b295c Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-linux.yml
#	src/base_consist.h
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/32bpp_optimized.hpp
#	src/blitter/32bpp_sse2.hpp
#	src/blitter/8bpp_optimized.hpp
#	src/gfx_func.h
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/linkgraph/linkgraphjob.cpp
#	src/mixer.cpp
#	src/newgrf_callbacks.h
#	src/openttd.cpp
#	src/os/macosx/macos.mm
#	src/os/windows/win32.cpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/sound.cpp
#	src/spritecache.cpp
#	src/spriteloader/spriteloader.hpp
#	src/station_map.h
#	src/timetable_cmd.cpp
#	src/timetable_cmd.h
#	src/timetable_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/video/opengl.cpp
#	src/video/opengl.h
#	src/viewport.cpp
 2023-12-17 23:00:46 +00:00
Jonathan G Rennison
e9599fd4be Scheduled dispatch: Remove scheduled_dispatch_start_full_date_fract 
Use DateTicksScaled
 2023-12-17 23:00:45 +00:00
Jonathan G Rennison
c76a5ed638 Timetable: Remove timetable_start_subticks, use DateTicksScaled 2023-12-17 23:00:44 +00:00