(svn r13386) -Fix: global currency/units setting being overriden when loading a savegame.

This commit is contained in:
rubidium
2008-06-05 11:26:38 +00:00
parent 9b971dab60
commit 9e811a2f8b
8 changed files with 52 additions and 47 deletions

View File

@@ -150,10 +150,10 @@ uint GetMaskOfAllowedCurrencies()
**/
void CheckSwitchToEuro()
{
if (_currency_specs[_settings_client.gui.currency].to_euro != CF_NOEURO &&
_currency_specs[_settings_client.gui.currency].to_euro != CF_ISEURO &&
_cur_year >= _currency_specs[_settings_client.gui.currency].to_euro) {
_settings_client.gui.currency = 2; // this is the index of euro above.
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) {
_settings_game.locale.currency = 2; // this is the index of euro above.
AddNewsItem(STR_EURO_INTRODUCE, NS_ECONOMY, 0, 0);
}
}