0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made --dummy-locales option actually...

Browse source 
...depend on support for dummy locales. Removed deprecated option
--dummylocales.
This commit is contained in:
Guillaume Melquiond 2009-04-12 08:39:07 +00:00
parent 3befa43159
commit 685fbf29a4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/game.cpp
View file

@ -401,11 +401,12 @@ game_controller::game_controller(int argc, char** argv) :
} else if(val == "-e" || val == "--editor") {
jump_to_editor_ = true;
#endif
} else if(val == "--dummylocales") {
std::cerr << "--dummylocales is deprecated use --dummy-locales instead.\n";
game_config::use_dummylocales = true;
} else if(val == "--dummy-locales") {
#ifdef USE_DUMMYLOCALES
game_config::use_dummylocales = true;
#else
std::cerr << "Option --dummy-locales ignored: support was not compiled in.\n";
#endif
} else if(val[0] == '-') {
std::cerr << "unknown option: " << val << std::endl;
throw config::error("unknown option");

3
src/language.cpp
View file

@ -218,8 +218,7 @@ static void wesnoth_setlocale(int category, std::string slocale,
locale = win_locale.c_str();
#endif
#ifndef _WIN32
// dummy locales aren't working in windows
#ifdef USE_DUMMYLOCALES
if (game_config::use_dummylocales)
{
static enum { UNINIT, NONE, PRESENT } status = UNINIT;