X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=6f1559b5e3d6241cc6231957a8bf400caa7c750a;hb=9eacc6f4e47b05a7c4942f205faac1d62b0fc289;hp=84004f468283e1c8b5e3e28b9948fa962fca2fb6;hpb=bc101e8e3ab8515fcc5fbed3d8bf8c3efc258846;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index 84004f46..6f1559b5 100644 --- a/src/main.c +++ b/src/main.c @@ -31,6 +31,7 @@ DrawBuffer *fieldbuffer; DrawBuffer *drawto_field; int game_status = -1; +boolean game_status_last_screen = -1; boolean level_editor_test_game = FALSE; boolean network_playing = FALSE; @@ -5630,10 +5631,10 @@ static void print_version() static void InitProgramConfig(char *command_filename) { - char *userdata_basename = getBaseNameNoSuffix(command_filename); - char *config_filename = getProgramConfigFilename(command_filename); char *program_title = PROGRAM_TITLE_STRING; char *program_icon_file = PROGRAM_ICON_FILENAME; + char *config_filename = getProgramConfigFilename(command_filename); + char *userdata_basename = getBaseNameNoSuffix(command_filename); char *userdata_subdir; char *userdata_subdir_unix; @@ -5673,7 +5674,6 @@ static void InitProgramConfig(char *command_filename) InitProgramInfo(command_filename, config_filename, userdata_subdir, - userdata_subdir_unix, program_title, program_title, program_icon_file, @@ -5690,7 +5690,7 @@ int main(int argc, char *argv[]) InitExitFunction(CloseAllAndExit); InitPlatformDependentStuff(); - GetOptions(argv, print_usage, print_version); + GetOptions(argc, argv, print_usage, print_version); OpenAll(); EventLoop();