dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,019 Commits 1 Branch 0 Tags
e1e7b67270bcd858c0727a0cc58bb2624e526e01
Commit Graph

2374 Commits

Author SHA1 Message Date
Jonathan G Rennison
2deadabc97 Saveload: Improve SpringPP savegame detection 
Trunk savegames will soon reach the range of versions used by SpringPP
 2019-10-13 13:03:12 +01:00
Jonathan G Rennison
1bbfd69657 Bump tracerestrict version due to 7332c0b6 2019-10-12 01:23:06 +01:00
Jonathan G Rennison
3b178b6f07 Scheduled dispatch: Add order backup support 2019-10-07 21:22:31 +01:00
Jonathan G Rennison
edfd378e93 Merge branch 'master' into jgrpp 
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
 2019-10-05 21:45:54 +01:00
Jonathan G Rennison
0246d59c8d FlowStat: Replace btree_map with flat map which is inlined in small case 
Inline storage for size <= 2
Size = 1 is ~90%
Size = 2 is ~9%
Size >=3 is ~1% and gets a separate allocation
 2019-10-01 02:34:15 +01:00
Jonathan G Rennison
90550d9642 FlowStatMap: Replace RB-tree with btree-indexed vector 2019-10-01 02:13:33 +01:00
Jonathan G Rennison
0a1c1809ab Save/load: Pre-filter SaveLoad descriptor arrays for current version/mode, for chunks with many objects 2019-10-01 02:13:33 +01:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
Jonathan G Rennison
5008a09fe9 Avoid unnecessary calls to SettingsDisableElrail in AfterLoadGame 2019-09-25 02:54:36 +01:00
Jonathan G Rennison
b6d755221a Add load filter to perform savegame decompression in a separate thread 2019-09-25 02:54:36 +01:00
Jonathan G Rennison
1391f8fc59 Use insert hints for station flow/share map insertion 2019-09-25 02:54:07 +01:00
Jonathan G Rennison
a30638bc4a Merge branch 'jgrpp' into jgrpp-nrt 2019-09-16 22:28:35 +01:00
Jonathan G Rennison
6792495705 Add -K switch to write savegame debug data and exit 2019-09-15 00:34:32 +01:00
Jonathan G Rennison
04ef407ddf Merge branch 'jgrpp' into jgrpp-nrt 
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp
 2019-08-24 10:41:08 +01:00
Jonathan G Rennison
a1d36b02f0 Network: Add state checksum which is check in network sync 2019-08-06 03:03:40 +01:00
Jonathan G Rennison
bc0de9b6ef Rebuild total cargo acceptance on load even for empty acceptance area 2019-08-01 23:05:31 +01:00
Jonathan G Rennison
1365600bed Merge branch 'jgrpp' into jgrpp-nrt 2019-07-13 20:35:17 +01:00
Jonathan G Rennison
d3e0c3787f Merge branch 'master' into jgrpp-nrt 
Merge trunk multiple docks implementation

# Conflicts:
#	docs/landscape_grid.html
#	src/order_cmd.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_order.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/tunnelbridge_cmd.cpp
 2019-07-13 20:34:52 +01:00
Jonathan G Rennison
dbc5f1baed Merge branch 'master' into jgrpp-nrt 
# Conflicts:
#	src/fontcache.cpp
#	src/game/game_text.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/os/windows/crashlog_win.cpp
#	src/station_cmd.cpp
#	src/viewport.cpp
 2019-07-11 20:03:23 +01:00
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
 2019-07-11 19:45:56 +01:00
Jonathan G Rennison
eab5db9769 Fix corruption of conditional order targets when loading SpringPP savegames 2019-07-11 18:46:48 +01:00
Jonathan G Rennison
97221a67f2 Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/saveload/vehicle_sl.cpp
 2019-07-11 03:16:29 +01:00
Jonathan G Rennison
bba36aef1b TBTR: Check for mixed virtual/non-virtual consists on load 2019-07-11 03:15:40 +01:00
Jonathan G Rennison
0f6c5ee622 Fix saveload exception handling when gamelog action in progress 2019-07-11 03:14:14 +01:00
Jonathan G Rennison
36eb4165b8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h
 2019-07-08 16:19:07 +01:00
Jonathan G Rennison
f78b72989b Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/saveload/vehicle_sl.cpp
#	src/train.h
 2019-07-03 22:25:47 +01:00
Jonathan G Rennison
f1946af707 TBTR: Delete leftover virtual trains on non-network client load 2019-07-03 22:22:50 +01:00
peter1138
f538179878 Feature: Multi-tile docks and docking points. 2019-06-30 16:46:32 +02:00
Jonathan G Rennison
1d5ba98932 Show time and in game date of game load in desync/crash logs 2019-06-14 21:56:37 +01:00
Jonathan G Rennison
e21c80ae45 Refresh town cargo acceptance/production on load on NewGRFs mismatch 
Also when reloading NewGRFs
 2019-05-26 20:29:29 +01:00
Jonathan G Rennison
c2470a21af Fix town production and acceptance cache saveload/update handling 2019-05-26 13:35:33 +01:00
Jonathan G Rennison
829c635add Add road layout change counter, add to road veh path caches 
Update layout counter when non-leaf road bits are added or removed
 2019-05-26 11:35:18 +01:00
Jonathan G Rennison
5a9790a196 Store crash/desync logs in crash/desync savegame 
Add console command to dump loaded debug log
 2019-05-23 22:53:17 +01:00
Jonathan G Rennison
ec1e848a7f Add log of game events since last load and overall 
Add console command
Add to crashlog
 2019-05-18 10:17:59 +01:00
PeterN
6fabfc3f21 Fix #7577: Check if linkgraph station index is valid before dereferencing. (#7583) 
(cherry picked from commit 83c1678f9e)
 2019-05-13 18:26:02 +01:00
Jonathan G Rennison
b91ee6fb4b Improve performance of name sorting in industry list window 2019-05-12 18:55:25 +01:00
Jonathan G Rennison
f6b9395c6a Improve performance of name sorting in town and station list windows 2019-05-12 18:03:57 +01:00
Niels Martin Hansen
140a96b3a0 Change: Limit memory allocations for each Squirrel instance 
This can avoid out-of-memory situations due to single scripts using up the entire address space.
Instead, scripts that go above the maximum are killed.
The maximum is default 1 GB per script, but can be configured by a setting.
 2019-05-11 15:34:33 +02:00
PeterN
83c1678f9e Fix #7577: Check if linkgraph station index is valid before dereferencing. (#7583) 2019-05-10 21:36:03 +01:00
Charles Pigott
10c8104e70 Fix 5db883f: Railtype bits were moved too late, leading to rails under bridges losing their type 
(cherry picked from commit 63a7df027d)
 2019-05-02 18:25:35 +01:00
Charles Pigott
e334f7db30 Fix #6507: Don't try to load invalid depots from older savegames 
(cherry picked from commit d9f9a64389)
 2019-05-02 18:21:13 +01:00
Charles Pigott
44911ec254 Fix: Crash when attempting to load old save game with GRFs set 
GroupStatistics pool was not initialised before trying to delete vehicles (specifically, trams with no tram track)

(cherry picked from commit 9da1c5bb0b)
 2019-05-02 18:20:46 +01:00
Jonathan G Rennison
1ee33c46ef Linkgraph: Allow overriding distribution mode on a per-cargo basis, in game 2019-05-01 20:57:59 +01:00
peter1138
c02ef3e456 Feature: Add NotRoadTypes (NRT) 2019-05-01 21:36:27 +02:00
Charles Pigott
63a7df027d Fix 5db883f: Railtype bits were moved too late, leading to rails under bridges losing their type 2019-04-29 17:46:28 +01:00
Charles Pigott
d9f9a64389 Fix #6507: Don't try to load invalid depots from older savegames 2019-04-29 17:46:28 +01:00
Charles Pigott
3299d6540b Cleanup: Delete GetSavegameType function since it's been commented out since 2005 2019-04-29 17:46:28 +01:00
Charles Pigott
9da1c5bb0b Fix: Crash when attempting to load old save game with GRFs set 
GroupStatistics pool was not initialised before trying to delete vehicles (specifically, trams with no tram track)
 2019-04-29 17:46:28 +01:00
Charles Pigott
327ff89808 Codechange: Remove PauseModeByte 2019-04-29 17:40:22 +01:00
Charles Pigott
5b34c8019f Codechange: Remove Company/OwnerByte types 2019-04-29 17:40:22 +01:00