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
This commit is contained in:
avolkov
2005-10-31 19:26:15 +00:00
parent 3bbf980303
commit 8773de0572
+3 -3
View File
@@ -466,7 +466,7 @@ parseOptions(int argc, char *argv[], struct options_struct *options)
options->gfxFlags |= TFB_GFXFLAGS_SCALE_BIADAPTADV; options->gfxFlags |= TFB_GFXFLAGS_SCALE_BIADAPTADV;
else if (!strcmp (optarg, "triscan")) else if (!strcmp (optarg, "triscan"))
options->gfxFlags |= TFB_GFXFLAGS_SCALE_TRISCAN; options->gfxFlags |= TFB_GFXFLAGS_SCALE_TRISCAN;
else else if (strcmp (optarg, "none") != 0)
{ {
InvalidArgument(optarg, "--scale or -c"); InvalidArgument(optarg, "--scale or -c");
badArg = TRUE; badArg = TRUE;
@@ -740,8 +740,8 @@ usage (FILE *out, const struct options_struct *defaultOptions)
fprintf (out, " -d, --bpp=BITSPERPIXEL (default 16)\n"); fprintf (out, " -d, --bpp=BITSPERPIXEL (default 16)\n");
fprintf (out, " -f, --fullscreen (default off)\n"); fprintf (out, " -f, --fullscreen (default off)\n");
fprintf (out, " -o, --opengl (default off)\n"); fprintf (out, " -o, --opengl (default off)\n");
fprintf (out, " -c, --scale=MODE (bilinear, biadapt, biadv or triscan, " fprintf (out, " -c, --scale=MODE (bilinear, biadapt, biadv, triscan "
"default is none)\n"); "or none (default) )\n");
fprintf (out, " -b, --meleezoom=MODE (step, aka pc, or smooth, aka 3do; " fprintf (out, " -b, --meleezoom=MODE (step, aka pc, or smooth, aka 3do; "
"default is 3do)\n"); "default is 3do)\n");
fprintf (out, " -s, --scanlines (default off)\n"); fprintf (out, " -s, --scanlines (default off)\n");