shithub: qk2

Info  •  Files  •  Log  •  Branches

fix multiple brainfarts

--- a/client/cl_main.c

+++ b/client/cl_main.c

@@ -1782,10 +1782,6 @@

 	// all archived variables will now be loaded

 	Con_Init ();

-/*	

-	VID_Init ();

-	S_Init ();	// sound must be initialized after window is created

-*/

 	S_Init ();	

 	VID_Init ();

--- a/plan9/cd_9.c

+++ b/plan9/cd_9.c

@@ -374,7 +374,7 @@

 	if((cdfile = open(cd_dev->string, OREAD)) < 0){

 		fprint(2, "CDAudio_Init: %r\n");

-		Com_Printf("CDAudio_Init: failed to open \"%s\"\n", cd_dev);

+		Com_Printf("CDAudio_Init: failed to open \"%s\"\n", cd_dev->string);

 		cdfile = -1;

 		return -1;

 	}

--- a/plan9/q_sh9.c

+++ b/plan9/q_sh9.c

@@ -284,8 +284,8 @@

 {

 	long n;

-	if(fdir = -1){

-		Sys_Error("Sys_FindNext without open");

+	if(fdir == -1){

+		Sys_Error("Sys_FindNext without open\n");

 		return nil;

 	}

 	while((n = dirread(fdir, &ddir)) > 0){