rixty
/
bygfoot
mirror of https://github.com/tstellar/bygfoot.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Move country file validation out of main_init() 

We only need to do this validation on program startup and main_init()
may be called multiple times (e.g. if someone starts multiple new games
without exiting)
This commit is contained in:
Tom Stellard 2020-12-31 13:20:43 -08:00 committed by Tom Stellard
parent b76f817c93
commit aa5d19b863
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main.c
View File

@ -338,6 +338,16 @@ static void validate_country_file(gpointer country_file, gpointer user_data)
xml_country_read(country_file, &country); xml_country_read(country_file, &country);
} }
static void validate_country_files()
{
GPtrArray *country_files = file_get_country_files();
if(country_files->len == 0)
main_exit_program(EXIT_NO_COUNTRY_FILES,
"Didn't find any country definition files in the support directories.");
g_ptr_array_foreach(country_files, validate_country_file, NULL);
}
/** /**
Process the command line arguments and do some things Process the command line arguments and do some things
that have to be done at the beginning (like initializing the that have to be done at the beginning (like initializing the
@ -389,14 +399,6 @@ main_init(gint *argc, gchar ***argv, Bygfoot *bygfoot)
load_last_save = FALSE; load_last_save = FALSE;
main_parse_cl_arguments(argc, argv, bygfoot); main_parse_cl_arguments(argc, argv, bygfoot);
/* Validate XML */
country_files = file_get_country_files();
if(country_files->len == 0)
main_exit_program(EXIT_NO_COUNTRY_FILES,
"Didn't find any country definition files in the support directories.");
g_ptr_array_foreach(country_files, validate_country_file, NULL);
} }
/** /**
@ -429,6 +431,8 @@ main (gint argc, gchar *argv[])
main_init(&argc, &argv, &bygfoot); main_init(&argc, &argv, &bygfoot);
validate_country_files();
if((load_last_save && !load_game_from_command_line(&bygfoot, "last_save")) || if((load_last_save && !load_game_from_command_line(&bygfoot, "last_save")) ||
(!load_last_save && (argc == 1 || (!load_last_save && (argc == 1 ||
(argc > 1 && !load_game_from_command_line(&bygfoot, argv[1]))))) (argc > 1 && !load_game_from_command_line(&bygfoot, argv[1])))))