summaryrefslogtreecommitdiff
path: root/src/saveload/oldloader_sl.cpp
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2011-11-15 20:47:53 +0000
committermichi_cc <michi_cc@openttd.org>2011-11-15 20:47:53 +0000
commit6548ec6e9ecf0f6d608d0b738213f62b1ce6e584 (patch)
treed8e94705bf49526712eda2cc81588d9b5fac8ee3 /src/saveload/oldloader_sl.cpp
parent88aaeb4092e563f9e894608fc27d507d4693f188 (diff)
downloadopenttd-6548ec6e9ecf0f6d608d0b738213f62b1ce6e584.tar.xz
(svn r23233) -Codechange: Refactor maximum and actually transported cargo amount of towns into a reusable struct.
Diffstat (limited to 'src/saveload/oldloader_sl.cpp')
-rw-r--r--src/saveload/oldloader_sl.cpp24
1 files changed, 12 insertions, 12 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 ),