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

consistently return 1 on initialization errors

Browse Source
This commit is contained in:
Gunter Labes 2009-10-20 19:23:46 +00:00
parent 6f0e366cb4
commit 5aef27579f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/game.cpp
View File

@ -88,6 +88,7 @@
#include "wesconfig.h" #include "wesconfig.h"
#include <cerrno>
#include <clocale> #include <clocale>
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>
@ -1971,19 +1972,19 @@ static int do_gameloop(int argc, char** argv)
res = font::load_font_config(); res = font::load_font_config();
if(res == false) { if(res == false) {
std::cerr << "could not initialize fonts\n"; std::cerr << "could not initialize fonts\n";
return 0; return 1;
} }
res = game.init_language(); res = game.init_language();
if(res == false) { if(res == false) {
std::cerr << "could not initialize the language\n"; std::cerr << "could not initialize the language\n";
return 0; return 1;
} }
res = game.init_video(); res = game.init_video();
if(res == false) { if(res == false) {
std::cerr << "could not initialize display\n"; std::cerr << "could not initialize display\n";
return 0; return 1;
} }
const cursor::manager cursor_manager; const cursor::manager cursor_manager;
@ -1998,14 +1999,14 @@ static int do_gameloop(int argc, char** argv)
res = game.init_config(); res = game.init_config();
if(res == false) { if(res == false) {
std::cerr << "could not initialize game config\n"; std::cerr << "could not initialize game config\n";
return 0; return 1;
} }
loadscreen::global_loadscreen->increment_progress(10, _("Re-initialize fonts for the current language.")); loadscreen::global_loadscreen->increment_progress(10, _("Re-initialize fonts for the current language."));
res = font::load_font_config(); res = font::load_font_config();
if(res == false) { if(res == false) {
std::cerr << "could not re-initialize fonts for the current language\n"; std::cerr << "could not re-initialize fonts for the current language\n";
return 0; return 1;
} }
loadscreen::global_loadscreen->increment_progress(0, _("Searching for installed add-ons.")); loadscreen::global_loadscreen->increment_progress(0, _("Searching for installed add-ons."));
@ -2197,8 +2198,10 @@ int main(int argc, char** argv)
safe_exit(res); safe_exit(res);
} catch(CVideo::error&) { } catch(CVideo::error&) {
std::cerr << "Could not initialize video. Exiting.\n"; std::cerr << "Could not initialize video. Exiting.\n";
return 1;
} catch(font::manager::error&) { } catch(font::manager::error&) {
std::cerr << "Could not initialize fonts. Exiting.\n"; std::cerr << "Could not initialize fonts. Exiting.\n";
return 1;
} catch(config::error& e) { } catch(config::error& e) {
std::cerr << e.message << "\n"; std::cerr << e.message << "\n";
} catch(gui::button::error&) { } catch(gui::button::error&) {
@ -2209,6 +2212,7 @@ int main(int argc, char** argv)
std::cerr << "caught end_level_exception (quitting)\n"; std::cerr << "caught end_level_exception (quitting)\n";
} catch(std::bad_alloc&) { } catch(std::bad_alloc&) {
std::cerr << "Ran out of memory. Aborted.\n"; std::cerr << "Ran out of memory. Aborted.\n";
return ENOMEM;
} catch(twml_exception& e) { } catch(twml_exception& e) {
std::cerr << "WML exception:\nUser message: " std::cerr << "WML exception:\nUser message: "
<< e.user_message << "\nDev message: " << e.dev_message << '\n'; << e.user_message << "\nDev message: " << e.dev_message << '\n';