diff --git a/src/currency.cpp b/src/currency.cpp --- a/src/currency.cpp +++ b/src/currency.cpp @@ -13,7 +13,6 @@ #include "currency.h" #include "news_func.h" #include "settings_type.h" -#include "date_func.h" #include "string_type.h" #include "timer/timer.h" #include "timer/timer_game_calendar.h" @@ -129,8 +128,8 @@ uint64 GetMaskOfAllowedCurrencies() for (i = 0; i < CURRENCY_END; i++) { Year to_euro = _currency_specs[i].to_euro; - if (to_euro != CF_NOEURO && to_euro != CF_ISEURO && _cur_year >= to_euro) continue; - if (to_euro == CF_ISEURO && _cur_year < 2000) continue; + if (to_euro != CF_NOEURO && to_euro != CF_ISEURO && TimerGameCalendar::year >= to_euro) continue; + if (to_euro == CF_ISEURO && TimerGameCalendar::year < 2000) continue; SetBit(mask, i); } SetBit(mask, CURRENCY_CUSTOM); // always allow custom currency @@ -144,7 +143,7 @@ static IntervalTimer { if (_currency_specs[_settings_game.locale.currency].to_euro != CF_NOEURO && _currency_specs[_settings_game.locale.currency].to_euro != CF_ISEURO && - _cur_year >= _currency_specs[_settings_game.locale.currency].to_euro) { + TimerGameCalendar::year >= _currency_specs[_settings_game.locale.currency].to_euro) { _settings_game.locale.currency = 2; // this is the index of euro above. AddNewsItem(STR_NEWS_EURO_INTRODUCTION, NT_ECONOMY, NF_NORMAL); }