dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r23233) -Codechange: Refactor maximum and actually transported cargo amount of towns into a reusable struct.

Browse Source
This commit is contained in:
michi_cc
2011-11-15 20:47:53 +00:00
parent b6d3db762d
commit 56a592dcbd
9 changed files with 110 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/saveload/oldloader_sl.cpp
View File

@@ -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 ),

40
src/saveload/town_sl.cpp
View File

@@ -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, 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, 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_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),