gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17058) -Codechange: magic numbers removal.

Browse Source 
Two values used intead of just one, as it gives more possibilities to those who dare...
This commit is contained in:
belugas 2009-08-03 20:02:25 +00:00
parent 37d01c7758
commit a2b996106e
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/company_base.h
View File

@ -75,7 +75,7 @@ struct Company : CompanyPool::PoolItem<&_company_pool> {
Money yearly_expenses[3][EXPENSES_END];
CompanyEconomyEntry cur_economy;
CompanyEconomyEntry old_economy[24];
CompanyEconomyEntry old_economy[MAX_HISTORY_MONTHS];
EngineRenewList engine_renew_list; ///< Defined later
CompanySettings settings; ///< settings specific for each company
uint16 *num_engines; ///< caches the number of engines of each type the company owns (no need to save this)

4
src/company_type.h
View File

@ -37,6 +37,10 @@ enum {
MAX_LENGTH_COMPANY_NAME_PIXELS = 150, ///< The maximum length of a company name in pixels
};
enum {
MAX_HISTORY_MONTHS = 24, ///< The maximum number of months kept as performance's history
};
/** Define basic enum properties */
template <> struct EnumPropsT<Owner> : MakeEnumPropsT<Owner, byte, OWNER_BEGIN, OWNER_END, INVALID_OWNER> {};
typedef TinyEnumT<Owner> OwnerByte;

2
src/economy.cpp
View File

@ -569,7 +569,7 @@ static void CompaniesGenStatistics()
c->old_economy[0] = c->cur_economy;
memset(&c->cur_economy, 0, sizeof(c->cur_economy));
if (c->num_valid_stat_ent != 24) c->num_valid_stat_ent++;
if (c->num_valid_stat_ent != MAX_HISTORY_MONTHS) c->num_valid_stat_ent++;
UpdateCompanyRatingAndValue(c, true);
if (c->block_preview != 0) c->block_preview--;

3
src/graph_gui.cpp
View File

@ -160,6 +160,7 @@ protected:
enum {
GRAPH_MAX_DATASETS = 32,
GRAPH_AXIS_LINE_COLOUR = 215,
GRAPH_NUM_MONTHS = 24, ///< Number of months displayed in the graph.
GRAPH_X_POSITION_BEGINNING = 44, ///< Start the graph 44 pixels from gd_left
GRAPH_X_POSITION_SEPARATION = 22, ///< There are 22 pixels between each X value
@ -190,7 +191,7 @@ protected:
Rect graph_location;
StringID format_str_y_axis;
byte colours[GRAPH_MAX_DATASETS];
OverflowSafeInt64 cost[GRAPH_MAX_DATASETS][24]; ///< last 2 years
OverflowSafeInt64 cost[GRAPH_MAX_DATASETS][GRAPH_NUM_MONTHS]; ///< Stored costs for the last #GRAPH_NUM_MONTHS months
/**
* Actually draw the graph.