diff options
| author | Niels Martin Hansen <nielsm@indvikleren.dk> | 2018-07-26 19:29:54 +0200 |
|---|---|---|
| committer | Niels Martin Hansen <nielsm@indvikleren.dk> | 2018-11-03 21:43:54 +0100 |
| commit | e66cec8f86357918c58b20bd3cc67330f277a5e1 (patch) | |
| tree | 1d34c8882bdc3fa2150ebcd06ea5e9ce247cd68a /src/saveload | |
| parent | 8859381d301a60169e167431c97cb084b7730ead (diff) | |
| download | openttd-e66cec8f86357918c58b20bd3cc67330f277a5e1.tar.xz | |
Add: NewGRF support for 16-in-16-out industries
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/afterload.cpp | 9 | ||||
| -rw-r--r-- | src/saveload/industry_sl.cpp | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 1529aca2b..077f86bf6 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -3033,6 +3033,15 @@ bool AfterLoadGame() i->accepts_cargo[ci] = CT_INVALID; i->incoming_cargo_waiting[ci] = 0; } + /* Make sure last_cargo_accepted_at is copied to elements for every valid input cargo. + * The loading routine should put the original singular value into the first array element. */ + for (size_t ci = 0; ci < lengthof(i->accepts_cargo); ci++) { + if (i->accepts_cargo[ci] != CT_INVALID) { + i->last_cargo_accepted_at[ci] = i->last_cargo_accepted_at[0]; + } else { + i->last_cargo_accepted_at[ci] = 0; + } + } } } diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp index 9727e4e51..a9c84e62a 100644 --- a/src/saveload/industry_sl.cpp +++ b/src/saveload/industry_sl.cpp @@ -61,7 +61,8 @@ static const SaveLoad _industry_desc[] = { SLE_CONDVAR(Industry, founder, SLE_UINT8, 70, SL_MAX_VERSION), SLE_CONDVAR(Industry, construction_date, SLE_INT32, 70, SL_MAX_VERSION), SLE_CONDVAR(Industry, construction_type, SLE_UINT8, 70, SL_MAX_VERSION), - SLE_CONDVAR(Industry, last_cargo_accepted_at, SLE_INT32, 70, SL_MAX_VERSION), + SLE_CONDVAR(Industry, last_cargo_accepted_at[0], SLE_INT32, 70, 201), + SLE_CONDARR(Industry, last_cargo_accepted_at, SLE_INT32, 16, 202, SL_MAX_VERSION), SLE_CONDVAR(Industry, selected_layout, SLE_UINT8, 73, SL_MAX_VERSION), SLEG_CONDARR(_old_ind_persistent_storage.storage, SLE_UINT32, 16, 76, 160), |