summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2010-07-31 19:45:48 +0000
committeralberth <alberth@openttd.org>2010-07-31 19:45:48 +0000
commit3f62ee635595998ad5d9d57cb5d986d6ac645c4b (patch)
tree5ffcae9c6b20e1feea4ea80d67880ce202b5bb3a
parentea05f284a96041dee30e04c19d2d1a503b52a72e (diff)
downloadopenttd-3f62ee635595998ad5d9d57cb5d986d6ac645c4b.tar.xz
(svn r20262) -Codechange: Remove unused ScoreInfo::id field, and doxyment the data structures.
-rw-r--r--src/economy.cpp24
-rw-r--r--src/economy_type.h3
2 files changed, 15 insertions, 12 deletions
diff --git a/src/economy.cpp b/src/economy.cpp
index 02422835d..803a246ae 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -92,18 +92,20 @@ static inline uint32 BigMulSU(const uint32 a, const uint32 b, const uint8 shift)
typedef SmallVector<Industry *, 16> SmallIndustryList;
-/* Score info */
+/**
+ * Score info, values used for computing the detailed performance rating.
+ */
const ScoreInfo _score_info[] = {
- { SCORE_VEHICLES, 120, 100 },
- { SCORE_STATIONS, 80, 100 },
- { SCORE_MIN_PROFIT, 10000, 100 },
- { SCORE_MIN_INCOME, 50000, 50 },
- { SCORE_MAX_INCOME, 100000, 100 },
- { SCORE_DELIVERED, 40000, 400 },
- { SCORE_CARGO, 8, 50 },
- { SCORE_MONEY, 10000000, 50 },
- { SCORE_LOAN, 250000, 50 },
- { SCORE_TOTAL, 0, 0 }
+ { 120, 100}, // SCORE_VEHICLES
+ { 80, 100}, // SCORE_STATIONS
+ { 10000, 100}, // SCORE_MIN_PROFIT
+ { 50000, 50}, // SCORE_MIN_INCOME
+ { 100000, 100}, // SCORE_MAX_INCOME
+ { 40000, 400}, // SCORE_DELIVERED
+ { 8, 50}, // SCORE_CARGO
+ {10000000, 50}, // SCORE_MONEY
+ { 250000, 50}, // SCORE_LOAN
+ { 0, 0} // SCORE_TOTAL
};
int _score_part[MAX_COMPANIES][SCORE_END];
diff --git a/src/economy_type.h b/src/economy_type.h
index 08cb2ceca..7942bc463 100644
--- a/src/economy_type.h
+++ b/src/economy_type.h
@@ -34,6 +34,7 @@ struct Economy {
uint16 old_max_loan_unround_fract; ///< Old: Fraction of the unrounded max loan
};
+/** Score categories in the detailed performance rating. */
enum ScoreID {
SCORE_BEGIN = 0,
SCORE_VEHICLES = 0,
@@ -53,8 +54,8 @@ enum ScoreID {
};
DECLARE_POSTFIX_INCREMENT(ScoreID)
+/** Data structure for storing how the score is computed for a single score id. */
struct ScoreInfo {
- byte id; ///< Unique ID of the score
int needed; ///< How much you need to get the perfect score
int score; ///< How much score it will give
};