make play/play2 dummies when -nosound

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7988 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/host_cmd.c b/host_cmd.c
index cb83f33721e7ea7a10e6de71af07516a446268d0..011cea07c1bf081164dff29e1c7e6250901ec822 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -2522,3 +2522,6 @@ void Host_InitCommands (void)
        Cvar_RegisterVariable(&sv_adminnick);
 }
 
+void Host_NoOperation_f(void)
+{
+}

diff --git a/quakedef.h b/quakedef.h
index bb9bb8406dec5de8e57c58ff106c4ab46f923fe8..87643cad3520a9dc5a38e2782957fb6c4011470b 100644 (file)
--- a/quakedef.h
+++ b/quakedef.h
@@ -322,6 +322,7 @@ void Host_Quit_f(void);
 void Host_ClientCommands(const char *fmt, ...) DP_FUNC_PRINTF(1);
 void Host_ShutdownServer(void);
 void Host_Reconnect_f(void);
+void Host_NoOperation_f(void);
 
 void Host_AbortCurrentFrame(void);
 

diff --git a/snd_main.c b/snd_main.c
index 4f7ca310813450a96a2e18d9bee6093c5ad75836..03b1358d161a79e2562dce42c4535b1cfecf5db3 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -722,7 +722,12 @@ void S_Init(void)
 
 // COMMANDLINEOPTION: Sound: -nosound disables sound (including CD audio)
        if (COM_CheckParm("-nosound"))
+       {
+               // dummy out Play and Play2 because mods stuffcmd that
+               Cmd_AddCommand("play", Host_NoOperation_f, "does nothing because -nosound was specified");
+               Cmd_AddCommand("play2", Host_NoOperation_f, "does nothing because -nosound was specified");
                return;
+       }
 
        snd_mempool = Mem_AllocPool("sound", 0, NULL);