From 8773de05723cdfb2c3947d032905b6a25759e0f9 Mon Sep 17 00:00:00 2001 From: avolkov Date: Mon, 31 Oct 2005 19:26:15 +0000 Subject: [PATCH] Allow setting --scale=none option from cmdline to override the saved config git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1938 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/starcon2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sc2/src/starcon2.c b/sc2/src/starcon2.c index 0494cecf8..a5ddb7d65 100644 --- a/sc2/src/starcon2.c +++ b/sc2/src/starcon2.c @@ -466,7 +466,7 @@ parseOptions(int argc, char *argv[], struct options_struct *options) options->gfxFlags |= TFB_GFXFLAGS_SCALE_BIADAPTADV; else if (!strcmp (optarg, "triscan")) options->gfxFlags |= TFB_GFXFLAGS_SCALE_TRISCAN; - else + else if (strcmp (optarg, "none") != 0) { InvalidArgument(optarg, "--scale or -c"); badArg = TRUE; @@ -740,8 +740,8 @@ usage (FILE *out, const struct options_struct *defaultOptions) fprintf (out, " -d, --bpp=BITSPERPIXEL (default 16)\n"); fprintf (out, " -f, --fullscreen (default off)\n"); fprintf (out, " -o, --opengl (default off)\n"); - fprintf (out, " -c, --scale=MODE (bilinear, biadapt, biadv or triscan, " - "default is none)\n"); + fprintf (out, " -c, --scale=MODE (bilinear, biadapt, biadv, triscan " + "or none (default) )\n"); fprintf (out, " -b, --meleezoom=MODE (step, aka pc, or smooth, aka 3do; " "default is 3do)\n"); fprintf (out, " -s, --scanlines (default off)\n");