Merge remote-tracking branch 'upstream-repo/master'

Diordany · Jun 7, 2024 · 337bcaf · 337bcaf
2 parents 3a92dc3 + 6dd4012
commit 337bcaf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/Linux/sgml/Quakespasm.sgml b/Linux/sgml/Quakespasm.sgml
@@ -149,6 +149,7 @@ QuakeSpasm 0.94 has support for playing the 2021 re-release content: Copy the qu
 <item> Improve handling of huge entities in SV_FindTouchedLeafs()
 <item> Apply FOV gun scaling for r_showtris
 <item> Sliders with visible values in options menu.
+<item> game command now refuses setting a non-existing game directory
 <item> Fix build in C23 mode.
 <item> Minor code cleanups. Updated third party code, e.g. SDL, music codecs, etc.
 <item> Thanks to Andrei Drexler, Alexey Lysiuk, Diordany van Hemert, and Jaime Moreira for patches.

diff --git a/Quake/gl_warp.c b/Quake/gl_warp.c
@@ -44,11 +44,11 @@ static const float	turbsin[] = {
 //
 //==============================================================================
 
-msurface_t	*warpface;
+static msurface_t	*warpface;
 
 cvar_t gl_subdivide_size = {"gl_subdivide_size", "128", CVAR_ARCHIVE};
 
-void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
+static void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
 {
 	int		i, j;
 	float	*v;
@@ -66,7 +66,7 @@ void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
 		}
 }
 
-void SubdividePolygon (int numverts, float *verts)
+static void SubdividePolygon (int numverts, float *verts)
 {
 	int		i, j, k;
 	vec3_t	mins, maxs;
@@ -80,7 +80,7 @@ void SubdividePolygon (int numverts, float *verts)
 	float	s, t;
 
 	if (numverts > 60)
-		Sys_Error ("numverts = %i", numverts);
+		Sys_Error ("SubdividePolygon: numverts = %i", numverts);
 
 	BoundPoly (numverts, verts, mins, maxs);
 
@@ -159,6 +159,9 @@ void GL_SubdivideSurface (msurface_t *fa)
 	vec3_t	verts[64];
 	int		i;
 
+	if (fa->polys->numverts > 64)
+		Sys_Error ("GL_SubdivideSurface: numverts = %i", fa->polys->numverts);
+
 	warpface = fa;
 
 	//the first poly in the chain is the undivided poly for newwater rendering.

diff --git a/Quakespasm.html b/Quakespasm.html
@@ -225,6 +225,7 @@ <H2><A NAME="ss5.1">5.1</A> <A HREF="#toc5.1">Changes in 0.96.2</A>
 <LI> Improve handling of huge entities in SV_FindTouchedLeafs()</LI>
 <LI> Apply FOV gun scaling for r_showtris</LI>
 <LI> Sliders with visible values in options menu.</LI>
+<LI> game command now refuses setting a non-existing game directory</LI>
 <LI> Fix build in C23 mode.</LI>
 <LI> Minor code cleanups. Updated third party code, e.g. SDL, music codecs, etc.</LI>
 <LI> Thanks to Andrei Drexler, Alexey Lysiuk, Diordany van Hemert, and Jaime Moreira for patches.</LI>

diff --git a/Quakespasm.txt b/Quakespasm.txt
@@ -240,6 +240,8 @@
 
   -  Sliders with visible values in options menu.
 
+  -  game command now refuses setting a non-existing game directory
+
   -  Fix build in C23 mode.
 
   -  Minor code cleanups. Updated third party code, e.g. SDL, music