From 40d5419cd209cd84e2ff28a0585bc4ec44688981 Mon Sep 17 00:00:00 2001 From: yexo Date: Sun, 11 Sep 2011 11:47:18 +0000 Subject: (svn r22920) -Cleanup: replace two very old town variables taht were rarely used by small functions that compute there value on-the-fly when necessary --- src/saveload/oldloader_sl.cpp | 3 +-- src/saveload/town_sl.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/saveload') diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index d4ff3758a..d8a54b6e8 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -577,8 +577,7 @@ static const OldChunks town_chunk[] = { 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_UINT8, Town, pct_pass_transported ), - OCL_SVAR( OC_UINT8, Town, pct_mail_transported ), + 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 ), diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp index 06b70d074..c0b48c6ba 100644 --- a/src/saveload/town_sl.cpp +++ b/src/saveload/town_sl.cpp @@ -146,8 +146,7 @@ static const SaveLoad _town_desc[] = { 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_VAR(Town, pct_pass_transported, SLE_UINT8), - SLE_VAR(Town, pct_mail_transported, SLE_UINT8), + 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), -- cgit v1.2.3-70-g09d2