X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sdl_gui.c;h=6aa78546502f3359930abc4ef02113462a788db3;hp=ca3bcc1f2b15cd3921af3b6647b3bdcf3f3337f3;hb=7c11e1acf8efc93b36fcae77c3f0ce04ae491c23;hpb=a7d844e5f23805a7521cfd8bf573dd822351c895 diff --git a/sdl_gui.c b/sdl_gui.c index ca3bcc1f..6aa78546 100644 --- a/sdl_gui.c +++ b/sdl_gui.c @@ -1,19 +1,7 @@ /* * Copyright (C) 2003-2007 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file sdl_gui.c SDL-based interface for paraslash */ @@ -752,9 +740,16 @@ int main(int argc, char *argv[]) args_info.config_file_arg); exit(EXIT_FAILURE); } - if (ret) - sdl_gui_cmdline_parser_configfile(args_info.config_file_arg, - &args_info, 0, 0, 0); + if (ret) { + struct sdl_gui_cmdline_parser_params params = { + .override = 0, + .initialize = 0, + .check_required = 0, + .check_ambiguity = 0 + }; + sdl_gui_cmdline_parser_config_file(args_info.config_file_arg, + &args_info, ¶ms); + } signal(SIGCHLD, SIG_IGN); width = args_info.width_arg; height = args_info.height_arg;