Add @vanilla tag for Vanilla doom command line options. Add missing

documentation for -nosound, -nomusic, -nosfx. Fix up some bugs with the
docgen wikitext output and allow control over output of Vanilla options.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 984

1 files changed, 28 insertions, 3 deletions

diff --git a/src/s_sound.c b/src/s_sound.c
index 57066ad4..cc071bde 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -241,18 +241,43 @@ static void InitMusicModule(void)
 
 void S_Init(int sfxVolume, int musicVolume)
 {  
+    boolean nosound, nosfx, nomusic;
     int i;
 
+    //!
+    // @vanilla
+    //
+    // Disable all sound output.
+    //
+
+    nosound = M_CheckParm("-nosound") > 0;
+
+    //!
+    // @vanilla
+    //
+    // Disable sound effects. 
+    //
+
+    nosfx = M_CheckParm("-nosfx") > 0;
+
+    //!
+    // @vanilla
+    //
+    // Disable music.
+    //
+
+    nomusic = M_CheckParm("-nomusic") > 0;
+
     // Initialise the sound and music subsystems.
 
-    if (M_CheckParm("-nosound") <= 0 && !screensaver_mode)
+    if (!nosound && !screensaver_mode)
     {
-        if (M_CheckParm("-nosfx") <= 0)
+        if (!nosfx)
         {
             InitSfxModule();
         }
 
-        if (M_CheckParm("-nomusic") <= 0)
+        if (!nomusic)
         {
             InitMusicModule();
         }