(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

@@ -39,7 +39,7 @@ extern CurrencySpec _currency_specs[NUM_CURRENCY];
// XXX small hack, but makes the rest of the code a bit nicer to read
#define _custom_currency (_currency_specs[CUSTOM_CURRENCY_ID])
#define _currency ((const CurrencySpec*)&_currency_specs[_settings_client.gui.currency])
#define _currency ((const CurrencySpec*)&_currency_specs[_game_mode == GM_MENU ? _settings_newgame.locale.currency : _settings_game.locale.currency])
uint GetMaskOfAllowedCurrencies();
void CheckSwitchToEuro();