diff options
author | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-01-10 18:56:51 +0000 |
commit | f35ed4bbc2b05f1b83476b60948d64375f77f1b4 (patch) | |
tree | 1a1c59c13ddb1d152052f3a3a0bcffe4fb531173 /src/economy.h | |
parent | a332d10fd938f345fff18e5f4a662a58f692f734 (diff) | |
download | openttd-f35ed4bbc2b05f1b83476b60948d64375f77f1b4.tar.xz |
(svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b.
Diffstat (limited to 'src/economy.h')
-rw-r--r-- | src/economy.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/economy.h b/src/economy.h index 823e167c8..7737eefd9 100644 --- a/src/economy.h +++ b/src/economy.h @@ -29,7 +29,8 @@ typedef struct Subsidy { } Subsidy; -enum { +enum ScoreID { + SCORE_BEGIN = 0, SCORE_VEHICLES = 0, SCORE_STATIONS = 1, SCORE_MIN_PROFIT = 2, @@ -40,13 +41,14 @@ enum { SCORE_MONEY = 7, SCORE_LOAN = 8, SCORE_TOTAL = 9, // This must always be the last entry - - NUM_SCORE = 10, // How many scores are there.. + SCORE_END = 10, // How many scores are there.. SCORE_MAX = 1000 // The max score that can be in the performance history // the scores together of score_info is allowed to be more! }; +DECLARE_POSTFIX_INCREMENT(ScoreID); + typedef struct ScoreInfo { byte id; // Unique ID of the score int needed; // How much you need to get the perfect score @@ -54,7 +56,7 @@ typedef struct ScoreInfo { } ScoreInfo; extern const ScoreInfo _score_info[]; -extern int _score_part[MAX_PLAYERS][NUM_SCORE]; +extern int _score_part[MAX_PLAYERS][SCORE_END]; int UpdateCompanyRatingAndValue(Player *p, bool update); |