Commit Graph

36 Commits (26cb47935e260f805aebea56217de7b23d648b4b)

Author SHA1 Message Date
Jonathan G Rennison 26cb47935e Saveload: Raise error if fclose fails in FileWriter 2 months ago
Jonathan G Rennison 041e71ec05 Merge branch 'master' into jgrpp
# Conflicts:
#	src/crashlog.cpp
#	src/gfx.cpp
#	src/network/network_client.cpp
#	src/openttd.cpp
#	src/openttd.h
#	src/saveload/saveload.cpp
#	src/survey.cpp
3 months ago
Jonathan G Rennison ba79f7b2ba Merge branch 'master' into jgrpp
# Conflicts:
#	src/base_station_base.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/object_gui.cpp
#	src/saveload/settings_sl.cpp
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/timer/timer_game_calendar.cpp
3 months ago
Jonathan G Rennison a92377fe98 Use upstream save/load for various unchanged chunks 3 months ago
Jonathan G Rennison b178be36f3 Saveload: Maintain map of chunk ID to (first byte) block mode 3 months ago
Jonathan G Rennison dadbad2bfc Saveload: Log changes in SlExecWithSlVersion 3 months ago
Jonathan G Rennison bd2358f6cc Saveload: Tidy up logging of chunk IDs
Add helper to dump chunk IDs as strings
Avoid duplicate logging of load steps for upstream load paths
3 months ago
Jonathan G Rennison ba1fa3ad29 Saveload: Fix SlNullPointers with upstream chunks 3 months ago
Jonathan G Rennison 4097fc4e33 Saveload: Enable upstream mode SlAutolength
Use non-upstream implementation for SlCopyBytes
3 months ago
Jonathan G Rennison 8a85055c68 Saveload: Use std::span for autosave temporary buffer view 3 months ago
Jonathan G Rennison 1040f9612f Saveload: Tag duplicate detection in SlTableHeader as maybe unused 3 months ago
Jonathan G Rennison 8581808952 Merge tag '14.0-beta2' into jgrpp
# Conflicts:
#	CMakeLists.txt
#	src/cargotype.cpp
#	src/console_cmds.cpp
#	src/graph_gui.cpp
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/misc_gui.cpp
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_town.cpp
#	src/object_cmd.cpp
#	src/openttd.cpp
#	src/pathfinder/water_regions.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/table/build_industry.h
#	src/table/engines.h
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
3 months ago
Jonathan G Rennison fdd666f66a Merge tag '14.0-beta1' into jgrpp
# Conflicts:
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/aircraft.h
#	src/animated_tile.h
#	src/base_consist.h
#	src/cargotype.h
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/engine_gui.cpp
#	src/industry_gui.cpp
#	src/lang/english.txt
#	src/music/extmidi.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_industries.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/order_type.h
#	src/os/macosx/misc_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_gui.cpp
#	src/rail_gui.h
#	src/roadveh.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/script/api/script_town.cpp
#	src/settingsgen/settingsgen.cpp
#	src/ship.h
#	src/ship_cmd.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen.h
#	src/table/settings/script_settings.ini
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_cmd.h
#	src/town_gui.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/waypoint_base.h
#	src/widget.cpp
3 months ago
Jonathan G Rennison 838b166726 Merge branch 'master' into jgrpp
# Conflicts:
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_base.h
#	src/debug.cpp
#	src/debug.h
#	src/economy.cpp
#	src/engine_type.h
#	src/graph_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_cmd.h
#	src/network/core/os_abstraction.cpp
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings_type.h
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/tests/bitmath_func.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
3 months ago
Jonathan G Rennison 7ce06e22b8 Split date types into calendar and economy dates
See: 735abfe1
4 months ago
Jonathan G Rennison b05738284b Windows: Avoid destruction of unjoined std::thread on ExitProcess
See: #649
4 months ago
Jonathan G Rennison 195b3b6d1d Saveload: Add initial table chunk support to non-upstream save backend 4 months ago
Jonathan G Rennison 936d636cdd No longer save/load water region invalidation states
Move InitializeWaterRegions to AllocateMap
No longer ForceUpdate in InitializeWaterRegions
5 months ago
Jonathan G Rennison 914b92b21f Merge branch 'master' into jgrpp
Bump savegame for water regions for ship pathfinder
Use ring_buffer for ShipPathCache
5 months ago
Jonathan G Rennison 97e6f3062e Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
5 months ago
Jonathan G Rennison f034714559 Use StringBuilder for GetString/GetStringWithArgs, as per upstream
Update dependent code as required
5 months ago
Jonathan G Rennison 2e9cb16254 Saveload: Simplify list handling in SlRefList
Use reserve on load if suitable
5 months ago
Jonathan G Rennison 378a545dd4 Add setting for map edge behaviour, and how to display area outside map 5 months ago
Jonathan G Rennison 4689113553 Debug: De-duplicate formatting of hex dates for desync/random logging 5 months ago
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
5 months ago
Jonathan G Rennison 5f08bde936 Saveload: Remove runtime IsVariableSizeRight check 6 months ago
Jonathan G Rennison ea3b991f72 MinGW: Remove direct mingw-std-threads includes 6 months ago
Jonathan G Rennison 9c29950956 Show savegame version/info in load window if sl debug enabled 7 months ago
Jonathan G Rennison 181eb6b6fe Saveload: Adjust flags for saving using upstream chunks 7 months ago
Jonathan G Rennison 23ad010d70 Replace remaining uses of std::deque with ring buffers
Cargo packet lists and associated save/load
10 months ago
Jonathan G Rennison e3021de408 Saveload: Add helper to conditionally save template functor 10 months ago
Jonathan G Rennison f378167951 Saveload: Change SlSaveToVector to be templated, add SlSaveToTempBuffer 10 months ago
Jonathan G Rennison f6e8ea059d Create fio wrapper for rename file 11 months ago
Jonathan G Rennison c6c69fa3da Add setting for long-term autosaves
A second set of autosaves for whenever the main set wraps around to 0
11 months ago
Jonathan G Rennison 0bf41dc1ff Change gamelog to use std::vector
Move LoadCheckData to its own header
11 months ago
Jonathan G Rennison ac2f9a21e8 Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/
Leave afterload in src/saveload/
12 months ago