Commit Graph

317 Commits

Author SHA1 Message Date
Jonathan G Rennison
2d71ec1c5a Bump savegame for object ground types 2021-12-05 21:46:09 +00:00
Jonathan G Rennison
74bfe4e6d2 Allow placing routing restrictions on tunnel/bridge entrance/exit signals
No reserve through support
2021-11-13 22:28:14 +00:00
Jonathan G Rennison
3308edf792 Try to extend reservation when passing sighting distance of non-end signal 2021-11-12 01:02:29 +00:00
Jonathan G Rennison
d1f1a6942a Add support for loading trunk savegames versions 293 - 299 (12.0)
Use modified upstream saveload implementation for these versions
Re-arrange headers to support multiple saveload implementations
2021-11-01 18:33:39 +00:00
SamuXarick
0563c0e308 Fix #9591: Update station docking tiles upon placing a water object on a docking tile (#9594)
(cherry picked from commit e404d16929)
2021-10-31 13:26:39 +00:00
Loïc Guilloux
a84feb3444 Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit (#9415)
(cherry picked from commit ddafc0de05)
2021-10-31 10:04:06 +00:00
Jonathan G Rennison
61cc60099a Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
2021-10-29 22:22:54 +01:00
Jonathan G Rennison
53139c2405 Add current day/month to tracerestrict and conditional order conditionals 2021-10-26 23:39:40 +01:00
Jonathan G Rennison
ffef1c9e44 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/table/settings/settings.ini
#	src/town_cmd.cpp
#	src/vehicle.cpp
2021-10-25 18:10:15 +01:00
Jonathan G Rennison
ec8512e2ea When declining to buy a company, ask the next company immediately 2021-10-24 00:07:54 +01:00
Jonathan G Rennison
544da99102 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/cargopacket.h
#	src/lang/korean.txt
#	src/linkgraph/linkgraph.h
#	src/linkgraph/linkgraphjob.h
#	src/linkgraph/linkgraphschedule.h
#	src/network/network_admin.h
#	src/network/network_func.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/order_base.h
#	src/rail_cmd.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/economy_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/signs_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/subsidy_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/script/api/script_object.cpp
#	src/settings.cpp
#	src/string.cpp
#	src/string_func.h
#	src/table/CMakeLists.txt
#	src/table/settings/settings.ini
#	src/viewport_sprite_sorter_sse4.cpp
2021-10-18 18:01:27 +01:00
Jonathan G Rennison
c99eaf72b7 Fix #9591: Update station docking tiles upon placing a water object on a docking tile (#9594)
See: https://github.com/OpenTTD/OpenTTD/issues/9591
See: https://github.com/OpenTTD/OpenTTD/pull/9594

Non-extended savegame bump to be applied later

(cherry picked from commit e404d16929)

# Conflicts:
#	src/object_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
2021-10-03 15:06:58 +01:00
Jonathan G Rennison
0dcb04f450 Fix #320: Misspelling of SLXI chunk name 2021-09-17 03:22:06 +01:00
Jonathan G Rennison
54e2d1b851 Log SLXI version label at level sl=2 2021-09-14 19:20:14 +01:00
Jonathan G Rennison
0748d540e8 Implement improved breakdown speed reductions for ships 2021-09-11 23:50:04 +01:00
Jonathan G Rennison
5d351a14d2 Add new signal type: no-entry signal
This is only passable in one direction, but does not have a signal
or show an aspect in the opposite direction

Add a setting for whether this is shown in the signal UI.
Off by default.
2021-09-04 11:39:54 +01:00
Jonathan G Rennison
16f2ef227b Store tunnel/bridge signal spacing on tile, adjust spacing to fit length 2021-08-29 02:11:58 +01:00
Jonathan G Rennison
b2ef6c0de8 Add implementation of multi-aspect signalling and GRF support
Requires realistic braking

See: #247
2021-08-28 12:54:18 +01:00
Jonathan G Rennison
13603cb8e1 Block signals into blocks with junctions now default to red with realistic braking 2021-08-24 17:30:06 +01:00
Jonathan G Rennison
b8d5113c5a Tracerestrict: Add slot action mode, try to acquire (only on reserve) 2021-08-15 22:39:52 +01:00
Jonathan G Rennison
71dfd2900a Add depot order flag for specific depot
Use upper half of order flags for extra depot flags

See: #302
2021-07-23 18:33:24 +01:00
Jonathan G Rennison
6a009686c9 Fix #299: Add estimated max speed (full) to template windows 2021-07-17 23:21:12 +01:00
Jonathan G Rennison
4174fe727c Add NewGRF feature: Extra station name strings
These are used when all the default names have been used up,
instead of "Town Station #NNN".
2021-07-17 20:54:10 +01:00
Jonathan G Rennison
158608442c Merge pull request #281 from VacuumBreather/train_speed_adaptation
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
2021-07-03 23:00:25 +01:00
Jonathan G Rennison
0f73fe765f Merge pull request #293 from VacuumBreather/station_cargo_history
Add station cargo history
2021-06-29 19:53:18 +01:00
Jonathan G Rennison
b438380a1e Add station cargo history save/load support 2021-06-29 19:37:20 +01:00
Jonathan G Rennison
fb0403dcee Add save/load support for train speed adaptation 2021-06-27 04:41:46 +01:00
Andreas Schmitt
e1214a6d8b Fix some type conversion warnings 2021-06-21 09:10:40 +02:00
Jonathan G Rennison
1002c6d9d2 Fix various compiler warnings
See: #267
2021-06-11 22:54:27 +01:00
Jonathan G Rennison
0579c8755c Add tracerestrict action: No PBS signal back PF penalty 2021-05-25 18:50:36 +01:00
Jonathan G Rennison
2e28bc8e6a Tracerestrict: Add engine class conditional 2021-05-13 23:49:03 +01:00
Jonathan G Rennison
14636d2512 Check multi-tile ID-translated houses after house ID limit change
(Or when reloading NewGRFs)
If an overriding house type which newly fit in the limit changed the
tile layout, existing houses on the map could have the wrong layout

See: #243
2021-04-19 23:04:54 +01:00
Jonathan G Rennison
6c62bce1ac Bump water flooding savegame version and clear states on load 2021-04-13 00:08:05 +01:00
Jonathan G Rennison
737b538492 Bump savegame version, copy town to city multipliers for old savegames 2021-04-12 20:08:05 +01:00
Jonathan G Rennison
d7b23733b3 Bump realistic braking savegame version 2021-04-11 23:45:00 +01:00
Jonathan G Rennison
4c2e42fae0 Add savegame conversion and version bump for more house IDs 2021-04-11 12:32:13 +01:00
Jonathan G Rennison
912c62d749 Add timetable lateness/earliness conditional order 2021-03-27 23:19:19 +00:00
Jonathan G Rennison
4361a6dbf4 Avoid undefined behaviour const_casting std::string c_str()
Use non-const data() instead

See: #224
2021-03-11 01:33:06 +00:00
Jonathan G Rennison
c37beb78ee Check for broken custom bridge head states, and bump save version 2021-02-27 21:31:23 +00:00
Jonathan G Rennison
f595696e97 Add map bit to suppress water flooding checks
Set if all neighbour tiles are also water
This reduces the overhead of flood checks on large maps
2021-02-21 21:11:35 +00:00
Jonathan G Rennison
aff89b61f5 Add tracerestrict reserved tiles ahead conditional 2021-02-13 03:29:35 +00:00
Jonathan G Rennison
35d720b0ad Add tracerestrict PBS end signal conditional
This is for realistic braking long reserve
2021-02-13 02:12:16 +00:00
Jonathan G Rennison
a0e9baac54 Bump more_cond_orders savegame version due to 8a814bbf 2021-02-12 18:00:22 +00:00
Jonathan G Rennison
d42ad99688 Add conditional order for current time/date 2021-02-10 18:34:46 +00:00
Jonathan G Rennison
33d9e48bcf Add setting for inflation dates mode 2021-01-30 19:59:00 +00:00
Jonathan G Rennison
ed0ffb6220 Add feature: realistic train braking
Add setting to select train braking model.
2021-01-28 19:03:18 +00:00
Jonathan G Rennison
515aeb04e0 TBTR: Add support for vehicle reversed flag 2021-01-10 18:10:20 +00:00
Jonathan G Rennison
8ac436f507 Add setting to scale primary industry cargo production 2020-12-21 20:47:44 +00:00
Jonathan G Rennison
f0c3a4b42e Saveload: Store NewGRF name in savegame, include in missing GRF message 2020-12-16 02:06:48 +00:00
Jonathan G Rennison
270a748b64 Tracerestrict: Add time/date conditional 2020-11-27 18:43:32 +00:00