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

Added --sound=openal|mixsdl|none option; -a is gone

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@693 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2003-02-06 04:43:20 +00:00
parent 0651c4e8e5
commit 2bcd5de8cf
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/starcon2.c
+19 -7
View File
@@ -93,7 +93,8 @@ main (int argc, char *argv[])
CSCAN_OPT = 1000, CSCAN_OPT = 1000,
MENU_OPT, MENU_OPT,
FONT_OPT, FONT_OPT,
SCROLL_OPT SCROLL_OPT,
SOUND_OPT
}; };
int option_index = 0, c; int option_index = 0, c;
@@ -103,7 +104,6 @@ main (int argc, char *argv[])
{"bpp", 1, NULL, 'd'}, {"bpp", 1, NULL, 'd'},
{"fullscreen", 0, NULL, 'f'}, {"fullscreen", 0, NULL, 'f'},
{"opengl", 0, NULL, 'o'}, {"opengl", 0, NULL, 'o'},
{"openal", 0, NULL, 'a'},
{"scale", 1, NULL, 'c'}, {"scale", 1, NULL, 'c'},
{"scanlines", 0, NULL, 's'}, {"scanlines", 0, NULL, 's'},
{"fps", 0, NULL, 'p'}, {"fps", 0, NULL, 'p'},
@@ -120,6 +120,7 @@ main (int argc, char *argv[])
{"menu", 1, NULL, MENU_OPT}, {"menu", 1, NULL, MENU_OPT},
{"font", 1, NULL, FONT_OPT}, {"font", 1, NULL, FONT_OPT},
{"scroll", 1, NULL, SCROLL_OPT}, {"scroll", 1, NULL, SCROLL_OPT},
{"sound", 1, NULL, SOUND_OPT},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
@@ -133,7 +134,7 @@ main (int argc, char *argv[])
strcpy (contentdir, "content"); strcpy (contentdir, "content");
#endif #endif
while ((c = getopt_long(argc, argv, "r:d:foac:spn:?hM:S:T:m:q:u", long_options, &option_index)) != -1) while ((c = getopt_long(argc, argv, "r:d:foc:spn:?hM:S:T:m:q:u", long_options, &option_index)) != -1)
{ {
switch (c) { switch (c) {
case 'r': case 'r':
@@ -148,9 +149,6 @@ main (int argc, char *argv[])
case 'o': case 'o':
gfxdriver = TFB_GFXDRIVER_SDL_OPENGL; gfxdriver = TFB_GFXDRIVER_SDL_OPENGL;
break; break;
case 'a':
snddriver = TFB_SOUNDDRIVER_OPENAL;
break;
case 'c': case 'c':
if (!strcmp (optarg, "bilinear")) if (!strcmp (optarg, "bilinear"))
{ {
@@ -248,6 +246,20 @@ main (int argc, char *argv[])
long_options[option_index].name)) != -1) long_options[option_index].name)) != -1)
optSmoothScroll = val; optSmoothScroll = val;
break; break;
case SOUND_OPT:
if (!strcmp (optarg, "openal"))
{
snddriver = TFB_SOUNDDRIVER_OPENAL;
}
else if (!strcmp (optarg, "none"))
{
snddriver = TFB_SOUNDDRIVER_NOSOUND;
}
else if (!strcmp (optarg, "mixsdl"))
{
snddriver = TFB_SOUNDDRIVER_MIXSDL;
}
break;
default: default:
printf ("\nOption %s not found!\n", long_options[option_index].name); printf ("\nOption %s not found!\n", long_options[option_index].name);
case '?': case '?':
@@ -257,7 +269,6 @@ main (int argc, char *argv[])
printf(" -d, --bpp=BITSPERPIXEL (default 16)\n"); printf(" -d, --bpp=BITSPERPIXEL (default 16)\n");
printf(" -f, --fullscreen (default off)\n"); printf(" -f, --fullscreen (default off)\n");
printf(" -o, --opengl (default off)\n"); printf(" -o, --opengl (default off)\n");
printf(" -a, --openal (default off)\n");
printf(" -c, --scale=mode (bilinear, biadapt or biadv, default is none)\n"); printf(" -c, --scale=mode (bilinear, biadapt or biadv, default is none)\n");
printf(" -s, --scanlines (default off)\n"); printf(" -s, --scanlines (default off)\n");
printf(" -p, --fps (default off)\n"); printf(" -p, --fps (default off)\n");
@@ -266,6 +277,7 @@ main (int argc, char *argv[])
printf(" -S, --sfxvol=VOLUME (0-100, default 100)\n"); printf(" -S, --sfxvol=VOLUME (0-100, default 100)\n");
printf(" -T, --speechvol=VOLUME (0-100, default 100)\n"); printf(" -T, --speechvol=VOLUME (0-100, default 100)\n");
printf(" -q, --audioquality=QUALITY (high, medium or low, default medium)\n"); printf(" -q, --audioquality=QUALITY (high, medium or low, default medium)\n");
printf(" --sound=DRIVER (openal, mixsdl, none; default mixsdl)\n");
printf(" -u, --nosubtitles\n"); printf(" -u, --nosubtitles\n");
printf("The following options can take either '3do' or 'pc' as an option:\n"); printf("The following options can take either '3do' or 'pc' as an option:\n");
printf(" -m, --music : Music version (default 3do)\n"); printf(" -m, --music : Music version (default 3do)\n");