diff options
| author | rubidium <rubidium@openttd.org> | 2006-08-16 11:39:55 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2006-08-16 11:39:55 +0000 |
| commit | 3cab5f30c06035034bcf5b513c2eee57b8ec11e9 (patch) | |
| tree | 90102c4cf1f03e52dfe00d3cd1315b6cd9e6b399 /currency.c | |
| parent | 50e96f8ff92bad28741ca3d360a4e7366072748d (diff) | |
| download | openttd-3cab5f30c06035034bcf5b513c2eee57b8ec11e9.tar.xz | |
(svn r5926) -Codechange: make _cur_year contain the full year, instead of the offset since 1920
-Codechange: store all year related variables that are _not_ stored in a savegame/transported over the network in the same format as _cur_year
Diffstat (limited to 'currency.c')
| -rw-r--r-- | currency.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/currency.c b/currency.c index 31e461687..2954a9973 100644 --- a/currency.c +++ b/currency.c @@ -81,8 +81,8 @@ uint GetMaskOfAllowedCurrencies(void) for (i = 0; i != lengthof(_currency_specs); i++) { uint16 to_euro = _currency_specs[i].to_euro; - if (to_euro != CF_NOEURO && to_euro != CF_ISEURO && BASE_YEAR + _cur_year >= to_euro) continue; - if (to_euro == CF_ISEURO && BASE_YEAR + _cur_year < 2000) continue; + if (to_euro != CF_NOEURO && to_euro != CF_ISEURO && _cur_year >= to_euro) continue; + if (to_euro == CF_ISEURO && _cur_year < 2000) continue; mask |= (1 << i); } mask |= (1 << CUSTOM_CURRENCY_ID); // always allow custom currency @@ -94,7 +94,7 @@ void CheckSwitchToEuro(void) { if (_currency_specs[_opt.currency].to_euro != CF_NOEURO && _currency_specs[_opt.currency].to_euro != CF_ISEURO && - BASE_YEAR + _cur_year >= _currency_specs[_opt.currency].to_euro) { + _cur_year >= _currency_specs[_opt.currency].to_euro) { _opt.currency = 2; // this is the index of euro above. AddNewsItem(STR_EURO_INTRODUCE, NEWS_FLAGS(NM_NORMAL, 0, NT_ECONOMY, 0), 0, 0); } |