dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,655 Commits 1 Branch 0 Tags
06e0f39affc89888e07640a1aea0808e89c4003d
Commit Graph

2579 Commits

Author SHA1 Message Date
Jonathan G Rennison
6f16655e6e Add "special events" log. Add console command, include in crash logs. 2021-10-04 20:54:12 +01:00
Jonathan G Rennison
2e022d5194 Move game events to new event_logs header/cpp files 2021-10-04 20:43:50 +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
SamuXarick
e404d16929 Fix #9591: Update station docking tiles upon placing a water object on a docking tile (#9594) 2021-10-03 12:54:19 +02:00
Jonathan G Rennison
96ea775b24 Avoid undefined behaviour in saveload chunk handlers 
Use data() instead of &[0] to avoid issues with empty vectors
 2021-10-02 22:43:55 +01:00
Jonathan G Rennison
fd605e3cf3 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/swedish.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/mcf.cpp
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_game.h
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/network/network_admin.h
#	src/network/network_chat_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf.cpp
#	src/newgrf_station.cpp
#	src/order_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/currency_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/terraform_cmd.cpp
#	src/timetable_gui.cpp
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/water_cmd.cpp
 2021-09-27 22:47:23 +01:00
Loïc Guilloux
38a64eb2aa Change: Allow all tiles around docks to be docking tiles (#9578) 2021-09-26 19:31:55 +02:00
Patric Stout
394c749b6b Change: Heading for 13 now (#9573) 2021-09-25 13:48:03 +02:00
Jonathan G Rennison
0b0d154788 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/ci-build.yml
#	src/lang/german.txt
#	src/lang/romanian.txt
#	src/lang/slovak.txt
#	src/lang/turkish.txt
#	src/network/core/address.cpp
#	src/network/core/tcp.h
#	src/network/core/udp.cpp
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/newgrf_sl.cpp
#	src/tree_cmd.cpp
#	src/video/video_driver.hpp
#	src/window.cpp
#	src/window_gui.h
 2021-09-22 21:50:02 +01:00
Jonathan G Rennison
0dcb04f450 Fix #320: Misspelling of SLXI chunk name 2021-09-17 03:22:06 +01:00
Jonathan G Rennison
e7480620af Include liblzma error code in message 2021-09-15 19:28:11 +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
Nicolas Chappe
977604ef08 Feature: [Linkgraph] Prioritize faster routes for passengers, mail and express cargo 
Passengers usually prefer fast paths to short paths.
Average travel times of links are updated in real-time for use in Dijkstra's algorithm,
and newer travel times weigh more, just like capacities.
 2021-08-17 14:57:59 +02: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
Loïc Guilloux
460991ecf4 Feature: Persistant rotation of numbered auto/netsave after restart (#9397) 
It was always starting from 0 on openttd restart.
Now the most recent auto/netsave number will be used as a base to generate the next filename.
 2021-07-17 12:48:35 +02:00
Rubidium
ede3f79475 Codechange: use the name string in SaveLoad for the name of the Setting as well 2021-07-09 22:53:30 +02:00
Rubidium
01139d3368 Codechange: access the name of a setting via an accessor function 2021-07-09 22:53:30 +02:00
Rubidium
94881f5a34 Codechange: name a few unnamed settings as to not to have to check for that being empty 2021-07-09 22:53:30 +02:00
Stephan
a70aa5df49 Add #9188: netsave now keeps multiple version around, similar to autosave (#9395) 2021-07-09 21:44:02 +02:00
Patric Stout
8f5d0ecde3 Codechange: split settings.ini over several files (#9421) 
This reduced the load on compilers, as currently for example MacOS
doesn't like the huge settings-tables.

Additionally, nobody can find settings, as the list is massive and
unordered. By splitting it, it becomes a little bit more sensible.
 2021-07-09 21:16:03 +02:00
Patric Stout
c1f13e0372 Fix: reduce the amount of debug messages on -dsl=2 (#9420) 
LoadCheck makes it sound like something is really broken while
loading savegames, while it really is perfectly normal, as most
chunks do not implement LoadCheck.
 2021-07-08 19:31:00 +02:00
glx22
7bcc7e11ff Codechange: Use a common sub-class for NewGRFMapping chunks 2021-07-06 22:29:08 +02:00
glx22
6e627f35ac Cleanup: Remove now unneeded ChunkHandler members 2021-07-06 22:29:08 +02:00
glx22
2c941cd8b3 Codechange: Use ChunkHandlers sub-classes 2021-07-06 22:29:08 +02:00
glx22
c1a9fe6fbd Codechange: Use static array of references to ChunkHandler 2021-07-06 22:29:08 +02:00
glx22
f371a5ad70 Codechange: Preparation for ChunkHandler subclassing 2021-07-06 22:29:08 +02:00
Rubidium
7e7a4aad72 Codechange: split off the settings saveload code from the main settings handling logic 2021-07-06 21:32:47 +02:00
Loïc Guilloux
ddafc0de05 Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit (#9415) 2021-07-06 21:09:08 +02: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
9edc13b889 Make sure setting set correctly on loading existing saves 2021-07-03 22:56:17 +01:00
Loïc Guilloux
0fa2007560 Fix cdb3dd049: GOAL chunk was not using the header for loading (#9409) 2021-07-03 18:26:24 +02:00
Patric Stout
3e3049fd0e Codechange: make savegame-version checks more obvious in SlCompanyLiveries::Load 
num_liveries indirectly contained the same information, but this
makes reading these things pretty difficult. So use IsSavegameVersionBefore()
like everywhere else instead.
 2021-07-02 22:21:58 +02:00
Patric Stout
4e645ce749 Codechange: using "until" in function names can be confusing 
IsSavegameVersionUntil() did a [0, N] check, not [0, N) as the
name suggests.

Until can be a confusing word, where people consider it to be
including the upperbound. Dictionary states it means "before",
excluding the upperbound. There are long debates about who is right.

So, simply remove away from this ambiguity, and call it "before"
and "before or at". This makes the world easier for everyone.
 2021-07-02 22:21:58 +02:00
Patric Stout
1ed2405907 Cleanup: remove SLE_NULL and friends 
We no longer need them. If you want to remove a field .. just
remove it! Because of the headers in the savegame, on loading,
it will do the right thing and skip the field.

Do remember to bump the savegame version, as otherwise older
clients can still load the game, but will reset the field you
have removed .. that might be unintentially.
 2021-07-02 22:21:58 +02:00
Patric Stout
3826703bc3 Add: store headers for chunks with SL_STRUCTLIST 2021-07-02 22:21:58 +02:00
Patric Stout
cdb3dd0493 Add: store headers for most savegame chunks 
When a header is added, the chunk changes from CH_ARRAY type to
CH_TABLE type.
 2021-07-02 22:21:58 +02:00
Patric Stout
7dd5fd6ed4 Feature: framework to make savegames self-descriptive 
We won't be able to make it fully self-descriptive (looking at you
MAP-chunks), but anything else can. With this framework, we can
add headers for each chunk explaining how each chunk looks like
in detail.

They also will all be tables, making it a lot easier to read in
external tooling, and opening the way to consider a database
(like SQLite) to use as savegame format.

Lastly, with the headers in the savegame, you can freely add
fields without needing a savegame version bump; older versions
of OpenTTD will simply ignore the new field. This also means
we can remove all the SLE_CONDNULL, as they are irrelevant.

The next few commits will start using this framework.
 2021-07-02 22:21:58 +02: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
5698507d0b Change station cargo history storage format 
Use uint16 to avoid truncation issues
Don't reserve memory for unused cargoes
Store history as ring buffer
Update history graph immediately on storage date
Show total waiting cargo
 2021-06-29 19:37:20 +01:00
Jonathan G Rennison
c4a596b756 Fix missing file from fb0403dc 2021-06-27 09:30:09 +01:00
Jonathan G Rennison
fb0403dcee Add save/load support for train speed adaptation 2021-06-27 04:41:46 +01:00