m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move command line analysis down a bit

Browse Source 
This is necessary so that the list of available video modes
is populated, making the -mode parameter work again.
This commit is contained in:
Nic Soudée 2018-08-16 09:14:33 -04:00
parent 995f9182fe
commit 78d99fd337
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.c
View File

@ -786,9 +786,6 @@ int Init_program(int argc,char * argv[])
Spare.time_of_safety_backup = 0; Spare.time_of_safety_backup = 0;
// analyse commande line as soon as possible
file_in_command_line=Analyze_command_line(argc, argv, main_filename, main_directory, spare_filename, spare_directory);
#if defined(USE_SDL) || defined(USE_SDL2) #if defined(USE_SDL) || defined(USE_SDL2)
// SDL // SDL
if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_JOYSTICK) < 0) if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_JOYSTICK) < 0)
@ -813,8 +810,14 @@ int Init_program(int argc,char * argv[])
// Texte // Texte
Init_text(); Init_text();
// On initialise tous les modes vidéo // Initialize all video modes
Set_all_video_modes(); Set_all_video_modes();
// Analyse command-line as soon as possible.
// This must come after video mode initialization because
// a video mode may be requested as a command-line parameter
file_in_command_line=Analyze_command_line(argc, argv, main_filename, main_directory, spare_filename, spare_directory);
Pixel_ratio=PIXEL_SIMPLE; Pixel_ratio=PIXEL_SIMPLE;
// On initialise les données sur l'état du programme: // On initialise les données sur l'état du programme:
// Donnée sur la sortie du programme: // Donnée sur la sortie du programme: