diff options
| author | peter1138 <peter1138@openttd.org> | 2006-04-20 21:13:08 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2006-04-20 21:13:08 +0000 |
| commit | 5ddf986c8d307374081593dc397ae1822704f70f (patch) | |
| tree | 87157df3a3d0081cea0a607cf0b4010524cd4d86 | |
| parent | 92d8af75dbf7a258f8964924a47dab199c4369e6 (diff) | |
| download | openttd-5ddf986c8d307374081593dc397ae1822704f70f.tar.xz | |
(svn r4487) - Codechange: replace the custom currency magic number 23 with a define
| -rw-r--r-- | currency.c | 2 | ||||
| -rw-r--r-- | currency.h | 3 | ||||
| -rw-r--r-- | settings.c | 2 | ||||
| -rw-r--r-- | settings_gui.c | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/currency.c b/currency.c index bd529f18b..d62aa2d73 100644 --- a/currency.c +++ b/currency.c @@ -84,7 +84,7 @@ uint GetMaskOfAllowedCurrencies(void) if (to_euro == CF_ISEURO && _cur_year < 2000 - MAX_YEAR_BEGIN_REAL) continue; mask |= (1 << i); } - mask |= (1 << 23); // always allow custom currency + mask |= (1 << CUSTOM_CURRENCY_ID); // always allow custom currency return mask; } diff --git a/currency.h b/currency.h index 596428a40..a94f85eb2 100644 --- a/currency.h +++ b/currency.h @@ -20,7 +20,8 @@ extern CurrencySpec _currency_specs[]; extern const StringID _currency_string_list[]; // XXX small hack, but makes the rest of the code a bit nicer to read -#define _custom_currency (_currency_specs[23]) +#define CUSTOM_CURRENCY_ID 23 +#define _custom_currency (_currency_specs[CUSTOM_CURRENCY_ID]) #define _currency ((const CurrencySpec*)&_currency_specs[_opt_ptr->currency]) uint GetMaskOfAllowedCurrencies(void); diff --git a/settings.c b/settings.c index 65e84dfb2..7cb7783c7 100644 --- a/settings.c +++ b/settings.c @@ -1151,7 +1151,7 @@ static const SettingDesc _gameopt_settings[] = { SDT_GENERAL("diff_custom", SDT_INTLIST, SL_ARR, (SLE_FILE_I16 | SLE_VAR_I32), 0, 0, GameOptions, diff, 17, 0, 0, 0, NULL, STR_NULL, NULL, 0, 3), SDT_GENERAL("diff_custom", SDT_INTLIST, SL_ARR, (SLE_FILE_I16 | SLE_VAR_I32), 0, 0, GameOptions, diff, 18, 0, 0, 0, NULL, STR_NULL, NULL, 4, SL_MAX_VERSION), SDT_VAR(GameOptions, diff_level,SLE_UINT8, 0, 0, 9,0, 9, STR_NULL, NULL), - SDT_OMANY(GameOptions, currency, SLE_UINT8, N, 0, 0, 23, "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SEK|custom", STR_NULL, NULL), + SDT_OMANY(GameOptions, currency, SLE_UINT8, N, 0, 0, CUSTOM_CURRENCY_ID, "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SEK|custom", STR_NULL, NULL), SDT_OMANY(GameOptions, units, SLE_UINT8, N, 0, 1, 2, "imperial|metric|si", STR_NULL, NULL), SDT_OMANY(GameOptions, town_name, SLE_UINT8, 0, 0, 0, 17, "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovakish|norwegian|hungarian|austrian|romanian|czech|swiss|danish", STR_NULL, NULL), SDT_OMANY(GameOptions, landscape, SLE_UINT8, 0, 0, 0, 3, "normal|hilly|desert|candy", STR_NULL, NULL), diff --git a/settings_gui.c b/settings_gui.c index a91d07652..2678f5eb0 100644 --- a/settings_gui.c +++ b/settings_gui.c @@ -171,8 +171,7 @@ static void GameOptionsWndProc(Window *w, WindowEvent *e) } break; case 5: /* Currency */ - if (e->dropdown.index == 23) - ShowCustCurrency(); + if (e->dropdown.index == CUSTOM_CURRENCY_ID) ShowCustCurrency(); _opt_ptr->currency = e->dropdown.index; MarkWholeScreenDirty(); break; |