Mercurial > hg > openttd
changeset 17699:74a00ba15e7d draft
(svn r22479) -Codechange/Fix: Months != quarters. (xi)
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Thu, 19 May 2011 21:03:23 +0000 |
| parents | 449bd9cdada1 |
| children | 3d1dd3abf47b |
| files | src/company_base.h src/company_type.h src/economy.cpp |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/company_base.h +++ b/src/company_base.h @@ -78,10 +78,10 @@ */ bool is_ai; - Money yearly_expenses[3][EXPENSES_END]; ///< Expenses of the company for the last three years, in every #Expenses category. - CompanyEconomyEntry cur_economy; ///< Economic data of the company of this quarter. - CompanyEconomyEntry old_economy[MAX_HISTORY_MONTHS]; ///< Economic data of the company of the last #MAX_HISTORY_MONTHS months. - byte num_valid_stat_ent; ///< Number of valid statistical entries in #old_economy. + Money yearly_expenses[3][EXPENSES_END]; ///< Expenses of the company for the last three years, in every #Expenses category. + CompanyEconomyEntry cur_economy; ///< Economic data of the company of this quarter. + CompanyEconomyEntry old_economy[MAX_HISTORY_QUARTERS]; ///< Economic data of the company of the last #MAX_HISTORY_QUARTERS quarters. + byte num_valid_stat_ent; ///< Number of valid statistical entries in #old_economy. CompanyProperties() : name(NULL), president_name(NULL) {}
--- a/src/company_type.h +++ b/src/company_type.h @@ -40,7 +40,7 @@ static const uint MAX_LENGTH_PRESIDENT_NAME_CHARS = 32; ///< The maximum length of a president name in characters including '\0' static const uint MAX_LENGTH_COMPANY_NAME_CHARS = 32; ///< The maximum length of a company name in characters including '\0' -static const uint MAX_HISTORY_MONTHS = 24; ///< The maximum number of months kept as performance's history +static const uint MAX_HISTORY_QUARTERS = 24; ///< The maximum number of quarters kept as performance's history /** Define basic enum properties */ template <> struct EnumPropsT<Owner> : MakeEnumPropsT<Owner, byte, OWNER_BEGIN, OWNER_END, INVALID_OWNER> {};
--- a/src/economy.cpp +++ b/src/economy.cpp @@ -565,7 +565,7 @@ c->old_economy[0] = c->cur_economy; memset(&c->cur_economy, 0, sizeof(c->cur_economy)); - if (c->num_valid_stat_ent != MAX_HISTORY_MONTHS) c->num_valid_stat_ent++; + if (c->num_valid_stat_ent != MAX_HISTORY_QUARTERS) c->num_valid_stat_ent++; UpdateCompanyRatingAndValue(c, true); if (c->block_preview != 0) c->block_preview--;