(svn r12090) -Codechange : removed a magic number and code style application on enum ExpensesType
--- a/src/economy_type.h Sat Feb 09 02:46:49 2008 +0000
+++ b/src/economy_type.h Sat Feb 09 02:49:33 2008 +0000
@@ -112,18 +112,19 @@
enum ExpensesType {
EXPENSES_CONSTRUCTION = 0,
- EXPENSES_NEW_VEHICLES = 1,
- EXPENSES_TRAIN_RUN = 2,
- EXPENSES_ROADVEH_RUN = 3,
- EXPENSES_AIRCRAFT_RUN = 4,
- EXPENSES_SHIP_RUN = 5,
- EXPENSES_PROPERTY = 6,
- EXPENSES_TRAIN_INC = 7,
- EXPENSES_ROADVEH_INC = 8,
- EXPENSES_AIRCRAFT_INC = 9,
- EXPENSES_SHIP_INC = 10,
- EXPENSES_LOAN_INT = 11,
- EXPENSES_OTHER = 12,
+ EXPENSES_NEW_VEHICLES,
+ EXPENSES_TRAIN_RUN,
+ EXPENSES_ROADVEH_RUN,
+ EXPENSES_AIRCRAFT_RUN,
+ EXPENSES_SHIP_RUN,
+ EXPENSES_PROPERTY,
+ EXPENSES_TRAIN_INC,
+ EXPENSES_ROADVEH_INC,
+ EXPENSES_AIRCRAFT_INC,
+ EXPENSES_SHIP_INC,
+ EXPENSES_LOAN_INT,
+ EXPENSES_OTHER,
+ EXPENSES_END,
INVALID_EXPENSES = 0xFF,
};
--- a/src/player_base.h Sat Feb 09 02:46:49 2008 +0000
+++ b/src/player_base.h Sat Feb 09 02:49:33 2008 +0000
@@ -62,7 +62,7 @@
bool is_active;
bool is_ai;
- Money yearly_expenses[3][13];
+ Money yearly_expenses[3][EXPENSES_END];
PlayerEconomyEntry cur_economy;
PlayerEconomyEntry old_economy[24];
EngineRenewList engine_renew_list; ///< Defined later
--- a/src/player_gui.cpp Sat Feb 09 02:46:49 2008 +0000
+++ b/src/player_gui.cpp Sat Feb 09 02:49:33 2008 +0000
@@ -46,7 +46,7 @@
static void DrawPlayerEconomyStats(const Player *p, byte mode)
{
int x, y, i, j, year;
- const Money (*tbl)[13];
+ const Money (*tbl)[EXPENSES_END];
Money sum, cost;
StringID str;