bgmusic.c: renamed -nomusic command line switch to -noextmusic. minor update.

updated documentation for the command line option name change.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@416 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2011-02-15 21:30:32 +00:00
parent 8fb84cf5d4
commit fe70ba99ab
4 changed files with 6 additions and 4 deletions

View file

@ -128,7 +128,7 @@ qboolean BGM_Init (void)
Cmd_AddCommand("music_loop", BGM_Loop_f); Cmd_AddCommand("music_loop", BGM_Loop_f);
Cmd_AddCommand("music_stop", BGM_Stop_f); Cmd_AddCommand("music_stop", BGM_Stop_f);
if (COM_CheckParm("-nomusic") != 0) if (COM_CheckParm("-noextmusic") != 0)
no_extmusic = true; no_extmusic = true;
bgmloop = true; bgmloop = true;
@ -302,6 +302,8 @@ void BGM_PlayCDtrack (byte track, qboolean looping)
{ {
if (! handler->is_available) if (! handler->is_available)
goto _next; goto _next;
if (! CDRIPTYPE(handler->type))
goto _next;
q_snprintf(tmp, sizeof(tmp), "%s/track%02d%s", q_snprintf(tmp, sizeof(tmp), "%s/track%02d%s",
MUSIC_DIRNAME, (int)track, handler->ext); MUSIC_DIRNAME, (int)track, handler->ext);
if (! COM_FileExists(tmp, &path_id)) if (! COM_FileExists(tmp, &path_id))

View file

@ -90,7 +90,7 @@ It includes 64bit CPU cupport, a new sound driver, several networking fixes, and
<UL> <UL>
<LI>Tracks should be named like "track02.ogg", "track03.ogg" ... (there is no track01) and placed into "Quake/id1/music".</LI> <LI>Tracks should be named like "track02.ogg", "track03.ogg" ... (there is no track01) and placed into "Quake/id1/music".</LI>
<LI>Unix users may need some extra libraries installed: libmad for MP3 and libogg and libvorbis for OGG.</LI> <LI>Unix users may need some extra libraries installed: libmad for MP3 and libogg and libvorbis for OGG.</LI>
<LI>Use the "-nomusic" option to disable this feature.</LI> <LI>Use the "-noextmusic" option to disable this feature.</LI>
</UL> </UL>
</P> </P>

View file

@ -48,7 +48,7 @@ Since version 0.85.4, Quakespasm can play back external MP3, OGG and Wave music
<itemize> <itemize>
<item>Tracks should be named like "track02.ogg", "track03.ogg" ... (there is no track01) and placed into "Quake/id1/music". <item>Tracks should be named like "track02.ogg", "track03.ogg" ... (there is no track01) and placed into "Quake/id1/music".
<item>Unix users may need some extra libraries installed: libmad for MP3 and libogg and libvorbis for OGG. <item>Unix users may need some extra libraries installed: libmad for MP3 and libogg and libvorbis for OGG.
<item>Use the "-nomusic" option to disable this feature. <item>Use the "-noextmusic" option to disable this feature.
</itemize> </itemize>

View file

@ -86,7 +86,7 @@
o Unix users may need some extra libraries installed: libmad for MP3 o Unix users may need some extra libraries installed: libmad for MP3
and libogg and libvorbis for OGG. and libogg and libvorbis for OGG.
o Use the "-nomusic" option to disable this feature. o Use the "-noextmusic" option to disable this feature.
4. Compiling 4. Compiling