shithub: qk2

Info  •  Files  •  Log  •  Branches

remove -nostdout: just redirect 1 and/or 2

also clean up unused s_nosound cvar

--- a/client/snd_loc.h

+++ b/client/snd_loc.h

@@ -139,7 +139,6 @@

 extern	portable_samplepair_t	s_rawsamples[MAX_RAW_SAMPLES];

 extern cvar_t	*s_volume;

-extern cvar_t	*s_nosound;

 extern cvar_t	*s_loadas8bit;

 extern cvar_t	*s_khz;

 extern cvar_t	*s_show;

--- a/plan9/snd_9.c

+++ b/plan9/snd_9.c

@@ -19,7 +19,6 @@

 cvar_t *sndspeed;

 cvar_t *sndchannels;

 cvar_t *snddevice;

-cvar_t *nosound;

 void sproc (void *)

@@ -45,7 +44,7 @@

 	if(sndon)

 		return false;

-	if(COM_CheckParm("-nosound"))	/* FIXME */

+	if(COM_CheckParm("-nosound"))

 		return false;

 	if(!snddevice){

--- a/plan9/sys_9.c

+++ b/plan9/sys_9.c

@@ -8,7 +8,6 @@

 mainstacksize = 512*1024;	/* FIXME */

-cvar_t *nostdout;

 uint sys_frame_time;

 qboolean stdin_active = true;

@@ -18,9 +17,7 @@

 /* prints to "debugging console" */

 void Sys_ConsoleOutput (char *string)

 {

-	if(nostdout != nil && nostdout->value)

-		return;

-	print("%s", string);

+	write(1, string, strlen(string));

 }

 void Sys_Quit (void)

@@ -112,8 +109,6 @@

 	setfcr(getfcr() & ~(FPOVFL|FPUNFL|FPINVAL|FPZDIV));	/* assumed ignored in code */

 	Qcommon_Init(argc, argv);

-

-	nostdout = Cvar_Get("nostdout", "0", 0);

 	oldtime = Sys_Milliseconds();

 	for(;;){