[Wesnoth-cvs-commits] wesnoth/src game.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/10/07 19:49:26

Modified files:
        src            : game.cpp 

Log message:
        Let's not break config/language initialization order on non-win32 
platforms. Reverting to old behavior, short term fix.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.143&tr2=1.144&r1=text&r2=text

Patches:
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.143 wesnoth/src/game.cpp:1.144
--- wesnoth/src/game.cpp:1.143  Thu Oct  7 05:59:30 2004
+++ wesnoth/src/game.cpp        Thu Oct  7 19:49:26 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.143 2004/10/07 05:59:30 silene Exp $ */
+/* $Id: game.cpp,v 1.144 2004/10/07 19:49:26 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1395,13 +1395,16 @@
        srand(time(NULL));
 
        game_controller game(argc,argv,use_sound);
-
-       bool res = game.init_config();
+
+       bool res;
+#ifdef WIN32
+       res = game.init_config();
        if(res == false) {
                std::cerr << "could not initialize game config\n";
                return 0;
        }
-       
+#endif
+
        res = game.init_video();
        if(res == false) {
                std::cerr << "could not initialize display\n";
@@ -1414,6 +1417,16 @@
                return 0;
        }
 
+#ifndef WIN32
+       // it is better for gettext-native platforms to read the config
+       // files after having pre-initialized the language, maybe...
+       res = game.init_config();
+       if(res == false) {
+               std::cerr << "could not initialize game config\n";
+               return 0;
+       }
+#endif
+
        const cursor::manager cursor_manager;
 #if defined(_X11) && !defined(__APPLE__)
        SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);