You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/src/saveload
Jonathan G Rennison ba8ed880c1 Merge branch 'master' into jgrpp-nrt
Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
5 years ago
..
afterload.cpp Merge branch 'master' into jgrpp-nrt 5 years ago
ai_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
airport_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
animated_tile_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
autoreplace_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
bridge_signal_sl.cpp Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
cargomonitor_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
cargopacket_sl.cpp Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
cheat_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
company_sl.cpp Merge branch 'master' into jgrpp-nrt 5 years ago
debug_sl.cpp Store crash/desync logs in crash/desync savegame 5 years ago
depot_sl.cpp Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
economy_sl.cpp Merge branch 'master' into jgrpp 6 years ago
engine_sl.cpp Cleanup: Fix alignment after NULL -> nullptr change. 6 years ago
extended_ver_sl.cpp Fix town production and acceptance cache saveload/update handling 5 years ago
extended_ver_sl.h Fix town production and acceptance cache saveload/update handling 5 years ago
game_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
gamelog_sl.cpp Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
goal_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
group_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
industry_sl.cpp Cleanup: Fix alignment after NULL -> nullptr change. 6 years ago
labelmaps_sl.cpp Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
linkgraph_sl.cpp Fix #7577: Check if linkgraph station index is valid before dereferencing. (#7583) 5 years ago
map_sl.cpp Merge branch 'master' into jgrpp 6 years ago
misc_sl.cpp Merge branch 'master' into jgrpp 5 years ago
newgrf_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
newgrf_sl.h
object_sl.cpp Cleanup: Fix alignment after NULL -> nullptr change. 6 years ago
oldloader.cpp Merge branch 'master' into jgrpp 5 years ago
oldloader.h Cleanup: Fix alignment after NULL -> nullptr change. 6 years ago
oldloader_sl.cpp Merge branch 'master' into jgrpp 5 years ago
order_sl.cpp Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
plans_sl.cpp Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
saveload.cpp Merge branch 'master' into jgrpp 5 years ago
saveload.h Merge branch 'master' into jgrpp-nrt 5 years ago
saveload_buffer.h Store crash/desync logs in crash/desync savegame 5 years ago
saveload_filter.h Codechange: Use null pointer literal instead of the NULL macro 6 years ago
saveload_internal.h Merge branch 'master' into jgrpp 5 years ago
signal_sl.cpp Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
signs_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
station_sl.cpp Merge branch 'master' into jgrpp 6 years ago
storage_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
story_sl.cpp Cleanup: Fix alignment after NULL -> nullptr change. 6 years ago
strings_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
subsidy_sl.cpp Codechange: Use null pointer literal instead of the NULL macro 6 years ago
tbtr_template_replacement_sl.cpp Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
tbtr_template_veh_sl.cpp Merge branch 'master' into jgrpp 5 years ago
town_sl.cpp Refresh town cargo acceptance/production on load on NewGRFs mismatch 5 years ago
tracerestrict_sl.cpp Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
tunnel_sl.cpp Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
vehicle_sl.cpp Merge branch 'master' into jgrpp-nrt 5 years ago
waypoint_sl.cpp Codechange: Remove Company/OwnerByte types 5 years ago