Merge branch 'qsrebase' of https://github.com/timbergeron/QSS-M into …

…qsrebase
timbergeron · Sep 18, 2024 · e242193 · e242193
2 parents da535dc + b254023
commit e242193
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Quake/cd_null.c b/Quake/cd_null.c
@@ -43,7 +43,6 @@ void CDAudio_Update(void)
 
 int CDAudio_Init(void)
 {
-	Con_Printf("CDAudio disabled at compile time\n");
 	return -1;
 }
 

diff --git a/Quake/console.c b/Quake/console.c
@@ -388,7 +388,7 @@ void Con_Init (void)
 	con_linewidth = -1;
 
 	//johnfitz -- no need to run Con_CheckResize here
-	con_linewidth = 38;
+	con_linewidth = 78;
 	con_totallines = con_buffersize / con_linewidth;//johnfitz -- con_buffersize replaces CON_TEXTSIZE
 	con_backscroll = 0;
 	con_current = con_totallines - 1;

diff --git a/Quake/r_part_fte.c b/Quake/r_part_fte.c
@@ -466,6 +466,7 @@ static cvar_t r_part_density = {"r_part_density", "1"};
 static cvar_t r_part_maxparticles = {"r_part_maxparticles", "65536"};
 static cvar_t r_part_maxdecals = {"r_part_maxdecals", "8192"};
 static cvar_t r_lightflicker = {"r_lightflicker", "1"};
+extern cvar_t r_particles; // woods (vk)
 
 static float particletime;
 
@@ -7763,6 +7764,9 @@ void PScript_DrawParticles (void)
 		pframetime = 1;
 	oldtime = cl.time;
 
+	if (!r_particles.value) // woodd (vk)
+		return;
+
 	if (r_part_rain.value)
 	{
 		for (i = 0; i < cl.num_entities; i++)
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,6 @@ void CDAudio_Update(void) @@
     int CDAudio_Init(void)
     {
-    	Con_Printf("CDAudio disabled at compile time\n");
     	return -1;
     }
@@ Expand Down @@