Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert part of patch r3444 to restore the --game option. Patch by Buginator in patch #970. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3708 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2008-02-07 13:08:59 +00:00
parent 7b2f64ecb1
commit 7d6a84b4a9
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/clparse.c
View File

@ -26,10 +26,11 @@
#include <string.h>
#include "lib/framework/frame.h"
#include "lib/widget/widget.h"
#include <popt.h>
#include "main.h"
#include "frontend.h"
#include "lib/ivis_common/pieclip.h"
#include "warzoneconfig.h"
@ -64,6 +65,7 @@ typedef enum
CLI_DEBUG,
CLI_DEBUGFILE,
CLI_FULLSCREEN,
CLI_GAME,
CLI_HELP,
CLI_MOD_GLOB,
CLI_MOD_CA,
@ -89,6 +91,7 @@ static const struct poptOption* getOptionsTable()
{ "debug", '\0', POPT_ARG_STRING, NULL, CLI_DEBUG, N_("Show debug for given level"), N_("debug level") },
{ "debugfile", '\0', POPT_ARG_STRING, NULL, CLI_DEBUGFILE, N_("Log debug output to file"), N_("file") },
{ "fullscreen", '\0', POPT_ARG_NONE, NULL, CLI_FULLSCREEN, N_("Play in fullscreen mode"), NULL },
{ "game", '\0', POPT_ARG_STRING, NULL, CLI_GAME, N_("Load a specific game"), N_("game-name") },
{ "help", 'h', POPT_ARG_NONE, NULL, CLI_HELP, N_("Show this help message and exit"), NULL },
{ "mod", '\0', POPT_ARG_STRING, NULL, CLI_MOD_GLOB, N_("Enable a global mod"), N_("mod") },
{ "mod_ca", '\0', POPT_ARG_STRING, NULL, CLI_MOD_CA, N_("Enable a campaign only mod"), N_("mod") },
@ -279,6 +282,19 @@ bool ParseCommandLine(int argc, const char** argv)
war_setFullscreen(TRUE);
break;
case CLI_GAME:
// retrieve the game name
token = poptGetOptArg(poptCon);
if (token == NULL)
{
debug(LOG_ERROR, "No game name");
poptFreeContext(poptCon);
abort();
return false;
}
strlcpy(aLevelName, token, sizeof(aLevelName));
SetGameMode(GS_NORMAL);
break;
case CLI_MOD_GLOB:
{
unsigned int i;