diff options
| author | bjarni <bjarni@openttd.org> | 2007-06-10 09:37:09 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2007-06-10 09:37:09 +0000 |
| commit | ff40914740a20c9deeffae1510e8c584d7e1af0c (patch) | |
| tree | a3f89807a419c24468528ef047316249827bdab8 | |
| parent | ab89ee7770bec91ffb2e34e71813ba7ddad8d866 (diff) | |
| download | openttd-ff40914740a20c9deeffae1510e8c584d7e1af0c.tar.xz | |
(svn r10080) -Cleanup: replaced magic numbers in SubtractMoneyFromAnyPlayer() with enum values
| -rw-r--r-- | src/players.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/players.cpp b/src/players.cpp index f4cb38787..3a71b4d08 100644 --- a/src/players.cpp +++ b/src/players.cpp @@ -193,9 +193,17 @@ static void SubtractMoneyFromAnyPlayer(Player *p, int32 cost) p->yearly_expenses[0][_yearly_expenses_type] += cost; - if (HASBIT(1<<7|1<<8|1<<9|1<<10, _yearly_expenses_type)) { + if (HASBIT(1 << EXPENSES_TRAIN_INC | + 1 << EXPENSES_ROADVEH_INC | + 1 << EXPENSES_AIRCRAFT_INC | + 1 << EXPENSES_SHIP_INC, _yearly_expenses_type)) { p->cur_economy.income -= cost; - } else if (HASBIT(1<<2|1<<3|1<<4|1<<5|1<<6|1<<11, _yearly_expenses_type)) { + } else if (HASBIT(1 << EXPENSES_TRAIN_RUN | + 1 << EXPENSES_ROADVEH_RUN | + 1 << EXPENSES_AIRCRAFT_RUN | + 1 << EXPENSES_SHIP_RUN | + 1 << EXPENSES_PROPERTY | + 1 << EXPENSES_LOAN_INT, _yearly_expenses_type)) { p->cur_economy.expenses -= cost; } |