adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change --meleescale to --meleezoom and remove =nearest; bug #694

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1691 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-04-28 00:15:36 +00:00
parent 4e59dce102
commit 7ada9dee22
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/starcon2.c
+5 -7
View File
@@ -265,7 +265,7 @@ static struct option longOptions[] =
{"fullscreen", 0, NULL, 'f'}, {"fullscreen", 0, NULL, 'f'},
{"opengl", 0, NULL, 'o'}, {"opengl", 0, NULL, 'o'},
{"scale", 1, NULL, 'c'}, {"scale", 1, NULL, 'c'},
{"meleescale", 1, NULL, 'b'}, {"meleezoom", 1, NULL, 'b'},
{"scanlines", 0, NULL, 's'}, {"scanlines", 0, NULL, 's'},
{"fps", 0, NULL, 'p'}, {"fps", 0, NULL, 'p'},
{"configdir", 1, NULL, 'C'}, {"configdir", 1, NULL, 'C'},
@@ -410,15 +410,13 @@ parseOptions(int argc, char *argv[], struct options_struct *options)
} }
break; break;
case 'b': case 'b':
if (!strcmp (optarg, "nearest")) if (!strcmp (optarg, "smooth") || !strcmp (optarg, "3do"))
options->meleeScale = TFB_SCALE_NEAREST;
else if (!strcmp (optarg, "trilinear"))
options->meleeScale = TFB_SCALE_TRILINEAR; options->meleeScale = TFB_SCALE_TRILINEAR;
else if (!strcmp (optarg, "step") || !strcmp (optarg, "pc")) else if (!strcmp (optarg, "step") || !strcmp (optarg, "pc"))
options->meleeScale = TFB_SCALE_STEP; options->meleeScale = TFB_SCALE_STEP;
else else
{ {
InvalidArgument(optarg, "--meleescale or -b"); InvalidArgument(optarg, "--meleezoom or -b");
badArg = TRUE; badArg = TRUE;
} }
break; break;
@@ -677,8 +675,8 @@ usage (FILE *out, const struct options_struct *defaultOptions)
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 or triscan, "
"default is none)\n"); "default is none)\n");
fprintf (out, " -b, --meleescale=MODE (nearest, trilinear, step; " fprintf (out, " -b, --meleezoom=MODE (step, aka pc, or smooth, aka 3do; "
"default is trilinear)\n"); "default is 3do)\n");
fprintf (out, " -s, --scanlines (default off)\n"); fprintf (out, " -s, --scanlines (default off)\n");
fprintf (out, " -p, --fps (default off)\n"); fprintf (out, " -p, --fps (default off)\n");
fprintf (out, " -g, --gamma=CORRECTIONVALUE (default 1.0, which " fprintf (out, " -g, --gamma=CORRECTIONVALUE (default 1.0, which "