mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12090) -Codechange : removed a magic number and code style application on enum ExpensesType

release/0.6
belugas 2008-02-09 02:49:33 +00:00
parent 9343ad44fd
commit cf9447c15b
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/economy_type.h
View File

@ -112,18 +112,19 @@ assert_compile(NUM_PRICES * sizeof(Money) == sizeof(Prices));
enum ExpensesType { enum ExpensesType {
EXPENSES_CONSTRUCTION = 0, EXPENSES_CONSTRUCTION = 0,
EXPENSES_NEW_VEHICLES = 1, EXPENSES_NEW_VEHICLES,
EXPENSES_TRAIN_RUN = 2, EXPENSES_TRAIN_RUN,
EXPENSES_ROADVEH_RUN = 3, EXPENSES_ROADVEH_RUN,
EXPENSES_AIRCRAFT_RUN = 4, EXPENSES_AIRCRAFT_RUN,
EXPENSES_SHIP_RUN = 5, EXPENSES_SHIP_RUN,
EXPENSES_PROPERTY = 6, EXPENSES_PROPERTY,
EXPENSES_TRAIN_INC = 7, EXPENSES_TRAIN_INC,
EXPENSES_ROADVEH_INC = 8, EXPENSES_ROADVEH_INC,
EXPENSES_AIRCRAFT_INC = 9, EXPENSES_AIRCRAFT_INC,
EXPENSES_SHIP_INC = 10, EXPENSES_SHIP_INC,
EXPENSES_LOAN_INT = 11, EXPENSES_LOAN_INT,
EXPENSES_OTHER = 12, EXPENSES_OTHER,
EXPENSES_END,
INVALID_EXPENSES = 0xFF, INVALID_EXPENSES = 0xFF,
}; };

2
src/player_base.h
View File

@ -62,7 +62,7 @@ struct Player {
bool is_active; bool is_active;
bool is_ai; bool is_ai;
Money yearly_expenses[3][13]; Money yearly_expenses[3][EXPENSES_END];
PlayerEconomyEntry cur_economy; PlayerEconomyEntry cur_economy;
PlayerEconomyEntry old_economy[24]; PlayerEconomyEntry old_economy[24];
EngineRenewList engine_renew_list; ///< Defined later EngineRenewList engine_renew_list; ///< Defined later

2
src/player_gui.cpp
View File

@ -46,7 +46,7 @@ static void DoSelectPlayerFace(PlayerID player, bool show_big);
static void DrawPlayerEconomyStats(const Player *p, byte mode) static void DrawPlayerEconomyStats(const Player *p, byte mode)
{ {
int x, y, i, j, year; int x, y, i, j, year;
const Money (*tbl)[13]; const Money (*tbl)[EXPENSES_END];
Money sum, cost; Money sum, cost;
StringID str; StringID str;