Author: silene
Date: Sun Apr 12 10:44:13 2009
New Revision: 34760
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34760&view=rev
Log:
Made --dummy-locales option actually depend on support for dummy locales.
Modified:
branches/1.6/src/game.cpp
branches/1.6/src/language.cpp
Modified: branches/1.6/src/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/game.cpp?rev=34760&r1=34759&r2=34760&view=diff
==============================================================================
--- branches/1.6/src/game.cpp (original)
+++ branches/1.6/src/game.cpp Sun Apr 12 10:44:13 2009
@@ -397,10 +397,15 @@
jump_to_editor_ = true;
#endif
} else if(val == "--dummylocales") {
- std::cerr << "--dummylocales is deprecated use
--dummy-locales instead.\n";
+ std::cerr << "Option --dummylocales is deprecated; use
--dummy-locales instead.\n";
+ goto enable_dummy_locales;
+ } else if(val == "--dummy-locales") {
+ enable_dummy_locales:
+#ifdef USE_DUMMYLOCALES
game_config::use_dummylocales = true;
- } else if(val == "--dummy-locales") {
- 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");
Modified: branches/1.6/src/language.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/language.cpp?rev=34760&r1=34759&r2=34760&view=diff
==============================================================================
--- branches/1.6/src/language.cpp (original)
+++ branches/1.6/src/language.cpp Sun Apr 12 10:44:13 2009
@@ -218,8 +218,7 @@
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;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
