SamuXarick
57553cd809
Fix #8020 : Add missing docking tiles around industry neutral stations
5 years ago
Jonathan G Rennison
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
5 years ago
Jonathan G Rennison
5dc1027c6b
Add initial support for loading ChillPP v14.7 savegames
5 years ago
Jonathan G Rennison
d56d4ea51f
Add initial support for loading JokerPP savegames
...
See #123
5 years ago
glx
b91abd3af9
Codechange: Replace FOR_ALL_ROADSTOPS with range-based for loops
5 years ago
glx
d8a1be48cd
Codechange: Replace vehicle related FOR_ALL with range-based for loops
5 years ago
glx
9892d90b26
Codechange: Replace order related FOR_ALL with range-based for loops
5 years ago
glx
ddabfed1cd
Codechange: Replace station related FOR_ALL with range-based for loops
5 years ago
Jonathan G Rennison
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
Jonathan G Rennison
b6e9817edb
Link graph: Explicitly flag invalidated flow stats instead of minimising their flows
...
Entirely exclude invalidated flow stats from link stats
Delete invalidated flow stats if they stay invalid for 32 link graph jobs
This is to prevent large numbers of invalidated flow stats from
unduly influencing link statistics
5 years ago
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
5 years ago
Jonathan G Rennison
90550d9642
FlowStatMap: Replace RB-tree with btree-indexed vector
5 years ago
Jonathan G Rennison
0a1c1809ab
Save/load: Pre-filter SaveLoad descriptor arrays for current version/mode, for chunks with many objects
5 years ago
Jonathan G Rennison
1391f8fc59
Use insert hints for station flow/share map insertion
5 years ago
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
5 years ago
peter1138
f538179878
Feature: Multi-tile docks and docking points.
5 years ago
Jonathan G Rennison
0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
6 years ago
peter1138
4f052fc2a4
Cleanup: Fix alignment after NULL -> nullptr change.
6 years ago
Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Jonathan G Rennison
2142452305
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/gamelog.cpp
# src/gamelog_internal.h
# src/lang/german.txt
# src/lang/korean.txt
# src/network/core/config.h
# src/network/network.cpp
# src/network/network_udp.cpp
# src/rev.h
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/gamelog_sl.cpp
# src/saveload/misc_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
# src/viewport.cpp
6 years ago
Peter Nelson
e21ade375e
Codechange: Change from numeric to descriptive SLV enum labels for last entries.
6 years ago
Peter Nelson
9de12521ec
Codechange: Convert saveload numbers to enum values.
...
(This was mostly achieved with a few in-place regexes)
6 years ago
Peter Nelson
ea4ea62816
Codechange: Make saveload version upper bound exclusive, i.e. version object was removed instead of version object last appeared.
6 years ago
Jonathan G Rennison
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
6 years ago
Peter Nelson
67633606b0
Codechange: Remove value mangling and field misuse in SLE_WRITEBYTE.
...
The original translation functionality hasn't been used since 2007.
6 years ago
Jonathan G Rennison
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
6 years ago
Jonathan G Rennison
6bcc705c7c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
Michael Lutz
4b0b4e0643
Feature: [NewGRF] Increase size of persistent storage to 256.
6 years ago
Jonathan G Rennison
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
PeterN
11ab3c4ea2
Change: Increase cargo type limit to 64.
6 years ago
Jonathan G Rennison
777151c34d
Station rating: Track last visited vehicle type separately per-cargo
6 years ago
Jonathan G Rennison
e6e93d40e8
Station flow stat save/load performance improvement
...
Avoid use of SlObject in inner loop
6 years ago
Jonathan G Rennison
be37aad470
Update multiple docks to use savegame framework, fix merge conflicts
7 years ago
keldorkatarn
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
7 years ago
Jonathan G Rennison
9077d6f4d2
Add support for loading SpringPP v2.3, v2.4 savegames
7 years ago
fonsinchen
4e13285274
(svn r27770) -Fix [FS#6540]: Initialize variables in station_sl.cpp (JGR)
8 years ago
Jonathan G Rennison
702404dc6a
Fix issues with uncleared variables when loading old save games.
8 years ago
Jonathan G Rennison
e844b82d9e
Use vector instead of list for Station::loading_vehicles.
8 years ago
Jonathan G Rennison
a422cb6753
Use a deque instead of list for CargoPacketList and StationCargoPacketMap.
8 years ago
Jonathan G Rennison
ba8d8d99b8
Add support for loading SpringPP savegame versions 221 and 222.
...
These correspond to versions from v2.1.108 and v2.1.147.
The oil rig airport type bug is fixed as of version 221.
The oil rig type has been moved, but this is not a problem as
the afterload code already remaps it to the correct value.
The cost scaling issue also seems to have been mostly fixed
as of version 221.
9 years ago
Jonathan G Rennison
39608841f2
Initial support for loading savegames from SpringPP v2.0.102/103
...
Savegame version 220
Bin all extra settings added in SpringPP.
Bin extra features: trip histories, more conditional orders/jump counter,
prev order time, snow-line chunk, town auto adv. campaign, etc.
Fix vehicle flags.
Fix bridges wrt height changes.
Handle 60-bit RIFF chunk sizes.
Doesn't deal with huge airports, loading games with these may
lead to undefined ehaviour.
PAX signals and traffic lights are ignored.
9 years ago
rubidium
f3b79480ed
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
10 years ago
rubidium
982f5a6aa2
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
10 years ago
rubidium
d214ca2c7d
(svn r26753) -Fix: desync due to not always properly restoring game state from the savegame
10 years ago
rubidium
134ad63b80
(svn r26753) -Fix: desync due to not always properly restoring game state from the savegame
10 years ago
rubidium
fb9dbf30fa
(svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore)
11 years ago
rubidium
89c25b955e
(svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore)
11 years ago
rubidium
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
11 years ago
rubidium
0463dbdc9e
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
11 years ago
frosch
74916a103e
(svn r26175) -Add: Log in desync output when persistent storage is discarded.
11 years ago
frosch
49852e3dac
(svn r26175) -Add: Log in desync output when persistent storage is discarded.
11 years ago
rubidium
73474728e3
(svn r26057) -Fix: a number of possibly uninitialised variables
11 years ago
rubidium
b3e93d6520
(svn r26057) -Fix: a number of possibly uninitialised variables
11 years ago
fonsinchen
7025a145e3
(svn r25899) -Change: Restrict flows if links are restricted and don't normally pick them anymore.
11 years ago
fonsinchen
6524849386
(svn r25899) -Change: Restrict flows if links are restricted and don't normally pick them anymore.
11 years ago
fonsinchen
1de46050f6
(svn r25362) -Feature: consider cargo waiting at other stations for rating at the origin station
11 years ago
fonsinchen
741c431caa
(svn r25362) -Feature: consider cargo waiting at other stations for rating at the origin station
11 years ago
fonsinchen
f022550df9
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
11 years ago
fonsinchen
04e3eb6fab
(svn r25361) -Feature: distribute cargo according to plan given by linkgraph
11 years ago
fonsinchen
45d7df8fc2
(svn r25360) -Codechange: save and load flow stats
11 years ago
fonsinchen
a2ff96d682
(svn r25360) -Codechange: save and load flow stats
11 years ago
fonsinchen
ace5038657
(svn r25337) -Fix: saving only 8 bits of 16 causes endianness problems
11 years ago
fonsinchen
16307a8a6f
(svn r25337) -Fix: saving only 8 bits of 16 causes endianness problems
11 years ago
rubidium
2b2706009e
(svn r25312) -Fix-ish: missing spaces after comma + realignment of tables; quite boring with -x -w
12 years ago
rubidium
f292a87dc4
(svn r25312) -Fix-ish: missing spaces after comma + realignment of tables; quite boring with -x -w
12 years ago
rubidium
7dd2354a13
(svn r25012) -Codechange: persistently keep 'reserved' cargo (for full-load improved loading) instead of calculating if for every cycle
12 years ago
rubidium
cdb0a76958
(svn r25012) -Codechange: persistently keep 'reserved' cargo (for full-load improved loading) instead of calculating if for every cycle
12 years ago
peter1138
1e10e91fde
(svn r24905) -Feature(ish): Implement station randomisation triggers.
12 years ago
peter1138
c00a400cc7
(svn r24905) -Feature(ish): Implement station randomisation triggers.
12 years ago
frosch
193ee85c6f
(svn r24718) -Codechange: Rename GoodsEntry::days_since_pickup to GoodsEntry::time_since_pickup.
12 years ago
frosch
883f9bec9b
(svn r24718) -Codechange: Rename GoodsEntry::days_since_pickup to GoodsEntry::time_since_pickup.
12 years ago
rubidium
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
rubidium
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
truebrain
8ac2d13c79
(svn r23636) -Add: introduce ScriptText in parameters where it can be used
13 years ago
truebrain
102f811d02
(svn r23636) -Add: introduce ScriptText in parameters where it can be used
13 years ago
rubidium
24263638bf
(svn r23526) -Codechange: unify cargos vs cargoes
13 years ago
rubidium
3d88c74389
(svn r23526) -Codechange: unify cargos vs cargoes
13 years ago
terkhen
7e0daae1ec
(svn r22567) -Codechange: Store persistent storages inside a pool.
14 years ago
terkhen
00e5c1df18
(svn r22567) -Codechange: Store persistent storages inside a pool.
14 years ago
terkhen
55695277c8
(svn r22540) -Codechange: Rename AcceptancePickup to GoodsEntryStatus.
14 years ago
terkhen
5bb79b1f46
(svn r22540) -Codechange: Rename AcceptancePickup to GoodsEntryStatus.
14 years ago
smatz
b04623b63c
(svn r22155) -Codechange: one comment in saveload/station_sl.cpp was wrong
14 years ago
smatz
8074f123d5
(svn r22155) -Codechange: one comment in saveload/station_sl.cpp was wrong
14 years ago
rubidium
83d1ff09c6
(svn r22057) -Fix: waypoint conversion could (previously) silently overfill the pool and crash
14 years ago
rubidium
13fd2cd335
(svn r22057) -Fix: waypoint conversion could (previously) silently overfill the pool and crash
14 years ago
smatz
8608a7c29b
(svn r22025) -Fix: verify there is enough space in the pool when creating new pool items while loading old savegames
14 years ago
smatz
887a7724dc
(svn r22025) -Fix: verify there is enough space in the pool when creating new pool items while loading old savegames
14 years ago
rubidium
971252a204
(svn r21795) -Fix (r21790): when converting TTDPatch train waypoints, convert the data on the map as well
14 years ago
rubidium
85255ea001
(svn r21795) -Fix (r21790): when converting TTDPatch train waypoints, convert the data on the map as well
14 years ago
smatz
1b062d2249
(svn r21794) -Fix (r21790): convert train orders too (Rubidium)
14 years ago
smatz
75351f4043
(svn r21794) -Fix (r21790): convert train orders too (Rubidium)
14 years ago
smatz
27630bd63c
(svn r21790) -Fix [FS#4398]: TTDPatch savegames can have train waypoints encoded as buoys
14 years ago
smatz
c58a910c8e
(svn r21790) -Fix [FS#4398]: TTDPatch savegames can have train waypoints encoded as buoys
14 years ago
smatz
8e6ec374a5
(svn r21784) -Fix (r16909): crash when converting savegame with custom waypoint name
14 years ago
smatz
ff469ab352
(svn r21784) -Fix (r16909): crash when converting savegame with custom waypoint name
14 years ago
alberth
16f678a990
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
14 years ago
alberth
3e27739287
(svn r21284) -Codechange: Rename CheckSavegameVersion() to IsSavegameVersionBefore().
14 years ago
rubidium
e567833521
(svn r20857) -Fix [FS#3637]: The station with the second highest rating was doubly penalised when distributing cargo. Now the penalty is completely removed and the granularity/precision of the distribution in increased by using fractional cargo. This should make competing stations less "all-or-nothing".
14 years ago