upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 21:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let's not break config/language initialization order on non-win32 platforms.

Browse Source 
Reverting to old behavior, short term fix.
This commit is contained in:
Guillaume Melquiond 2004-10-07 19:49:26 +00:00
parent f443665fd1
commit 928e898ef6
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/game.cpp
View File

@ -1396,12 +1396,15 @@ int play_game(int argc, char** argv)
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 @@ int play_game(int argc, char** argv)
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);