From 2710920a7ccb09022dd8d4807bffdc956f9f0a88 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Mon, 10 May 2010 23:48:38 +0000 Subject: [PATCH] skip all command-line switches git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4834 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/wizard.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/source/src/wizard.cpp b/source/src/wizard.cpp index 4f124033..a5942c25 100644 --- a/source/src/wizard.cpp +++ b/source/src/wizard.cpp @@ -46,12 +46,19 @@ static void readarg(vector &argstr, const char *desc, const char *name) int wizardmain(int argc, char **argv) { - int k, i = 0; - while ( ( k = strncmp(argv[i],"--wizard",8) ) != 0 && i < argc ) i++; - if ( k != 0 ) return EXIT_FAILURE; - - char *outfile = argv[++i]; - char *relpath = argv[++i]; + const char *outfile = NULL, *relpath = NULL; + for(int i = 1; i < argc; i++) + { + if(argv[i][0] == '-') continue; + if(!outfile) outfile = argv[i]; + else if(!relpath) relpath = argv[i]; + } + if(!outfile || !relpath) + { + printf("invalid arguments specified!\n"); + printf("usage: ac_server \n"); + return EXIT_FAILURE; + } printf("AssaultCube Server Wizard\n\n"); printf("You can now specify some optional server settings.\n"