diff options
| author | michi_cc <michi_cc@openttd.org> | 2011-11-15 20:47:53 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2011-11-15 20:47:53 +0000 |
| commit | 6548ec6e9ecf0f6d608d0b738213f62b1ce6e584 (patch) | |
| tree | d8e94705bf49526712eda2cc81588d9b5fac8ee3 /src/saveload | |
| parent | 88aaeb4092e563f9e894608fc27d507d4693f188 (diff) | |
| download | openttd-6548ec6e9ecf0f6d608d0b738213f62b1ce6e584.tar.xz | |
(svn r23233) -Codechange: Refactor maximum and actually transported cargo amount of towns into a reusable struct.
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/oldloader_sl.cpp | 24 | ||||
| -rw-r--r-- | src/saveload/town_sl.cpp | 42 |
2 files changed, 33 insertions, 33 deletions
diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index 73ab7a016..83f01d967 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -568,21 +568,21 @@ static const OldChunks town_chunk[] = { OCL_SVAR( OC_FILE_U8 | OC_VAR_U16, Town, time_until_rebuild ), OCL_SVAR( OC_FILE_U8 | OC_VAR_I16, Town, growth_rate ), - OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, new_max_pass ), - OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, new_max_mail ), - OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, new_act_pass ), - OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, new_act_mail ), - OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, max_pass ), - OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, max_mail ), - OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, act_pass ), - OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, act_mail ), + OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, pass.new_max ), + OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, mail.new_max ), + OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, pass.new_act ), + OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, mail.new_act ), + OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, pass.old_max ), + OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, mail.old_max ), + OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, pass.old_act ), + OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, mail.old_act ), OCL_NULL( 2 ), ///< pct_pass_transported / pct_mail_transported, now computed on the fly - OCL_SVAR( OC_TTD | OC_UINT16, Town, new_act_food ), - OCL_SVAR( OC_TTD | OC_UINT16, Town, new_act_water ), - OCL_SVAR( OC_TTD | OC_UINT16, Town, act_food ), - OCL_SVAR( OC_TTD | OC_UINT16, Town, act_water ), + OCL_SVAR( OC_TTD | OC_UINT16, Town, food.new_act ), + OCL_SVAR( OC_TTD | OC_UINT16, Town, water.new_act ), + OCL_SVAR( OC_TTD | OC_UINT16, Town, food.old_act ), + OCL_SVAR( OC_TTD | OC_UINT16, Town, water.old_act ), OCL_SVAR( OC_UINT8, Town, road_build_months ), OCL_SVAR( OC_UINT8, Town, fund_buildings_months ), diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp index 512c3b4c5..3bad27335 100644 --- a/src/saveload/town_sl.cpp +++ b/src/saveload/town_sl.cpp @@ -128,30 +128,30 @@ static const SaveLoad _town_desc[] = { SLE_CONDARR(Town, unwanted, SLE_INT8, 8, 4, 103), SLE_CONDARR(Town, unwanted, SLE_INT8, MAX_COMPANIES, 104, SL_MAX_VERSION), - SLE_CONDVAR(Town, max_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), - SLE_CONDVAR(Town, max_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), - SLE_CONDVAR(Town, new_max_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), - SLE_CONDVAR(Town, new_max_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), - SLE_CONDVAR(Town, act_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), - SLE_CONDVAR(Town, act_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), - SLE_CONDVAR(Town, new_act_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), - SLE_CONDVAR(Town, new_act_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), - - SLE_CONDVAR(Town, max_pass, SLE_UINT32, 9, SL_MAX_VERSION), - SLE_CONDVAR(Town, max_mail, SLE_UINT32, 9, SL_MAX_VERSION), - SLE_CONDVAR(Town, new_max_pass, SLE_UINT32, 9, SL_MAX_VERSION), - SLE_CONDVAR(Town, new_max_mail, SLE_UINT32, 9, SL_MAX_VERSION), - SLE_CONDVAR(Town, act_pass, SLE_UINT32, 9, SL_MAX_VERSION), - SLE_CONDVAR(Town, act_mail, SLE_UINT32, 9, SL_MAX_VERSION), - SLE_CONDVAR(Town, new_act_pass, SLE_UINT32, 9, SL_MAX_VERSION), - SLE_CONDVAR(Town, new_act_mail, SLE_UINT32, 9, SL_MAX_VERSION), + SLE_CONDVAR(Town, pass.old_max, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), + SLE_CONDVAR(Town, mail.old_max, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), + SLE_CONDVAR(Town, pass.new_max, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), + SLE_CONDVAR(Town, mail.new_max, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), + SLE_CONDVAR(Town, pass.old_act, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), + SLE_CONDVAR(Town, mail.old_act, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), + SLE_CONDVAR(Town, pass.new_act, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), + SLE_CONDVAR(Town, mail.new_act, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), + + SLE_CONDVAR(Town, pass.old_max, SLE_UINT32, 9, SL_MAX_VERSION), + SLE_CONDVAR(Town, mail.old_max, SLE_UINT32, 9, SL_MAX_VERSION), + SLE_CONDVAR(Town, pass.new_max, SLE_UINT32, 9, SL_MAX_VERSION), + SLE_CONDVAR(Town, mail.new_max, SLE_UINT32, 9, SL_MAX_VERSION), + SLE_CONDVAR(Town, pass.old_act, SLE_UINT32, 9, SL_MAX_VERSION), + SLE_CONDVAR(Town, mail.old_act, SLE_UINT32, 9, SL_MAX_VERSION), + SLE_CONDVAR(Town, pass.new_act, SLE_UINT32, 9, SL_MAX_VERSION), + SLE_CONDVAR(Town, mail.new_act, SLE_UINT32, 9, SL_MAX_VERSION), SLE_CONDNULL(2, 0, 163), ///< pct_pass_transported / pct_mail_transported, now computed on the fly - SLE_VAR(Town, act_food, SLE_UINT16), - SLE_VAR(Town, act_water, SLE_UINT16), - SLE_VAR(Town, new_act_food, SLE_UINT16), - SLE_VAR(Town, new_act_water, SLE_UINT16), + SLE_VAR(Town, food.old_act, SLE_UINT16), + SLE_VAR(Town, water.old_act, SLE_UINT16), + SLE_VAR(Town, food.new_act, SLE_UINT16), + SLE_VAR(Town, water.new_act, SLE_UINT16), SLE_CONDVAR(Town, time_until_rebuild, SLE_FILE_U8 | SLE_VAR_U16, 0, 53), SLE_CONDVAR(Town, grow_counter, SLE_FILE_U8 | SLE_VAR_U16, 0, 53), |