ioq3 updates.

Qsort cannot be called with NULL. More predictable mesh normals generation.
AmigaPorts · Nov 17, 2022 · 07ffbcd · 07ffbcd
1 parent b637b6f
commit 07ffbcd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
@@ -3172,7 +3172,8 @@ void FS_AddGameDirectory( const char *path, const char *dir )
 	// Get .pk3 files
 	pakfiles = Sys_ListFiles(curpath, ".pk3", NULL, &numfiles, qfalse);
 
-	qsort( pakfiles, numfiles, sizeof(char*), paksort );
+	if ( pakfiles )
+		qsort( pakfiles, numfiles, sizeof(char*), paksort );
 
 	if ( fs_numServerPaks )
 	{

diff --git a/code/renderer/tr_curve.c b/code/renderer/tr_curve.c
@@ -204,7 +204,7 @@ static void MakeMeshNormals( int width, int height, drawVert_t ctrl[MAX_GRID_SIZ
 
 					VectorSubtract( ctrl[y][x].xyz, base, temp );
 
-					if ( VectorNormalize2( temp, temp ) == 0 ) {
+					if ( VectorNormalize( temp ) < 0.001f ) {
 						continue;				// degenerate edge, get more dist
 					}
 
@@ -227,7 +227,7 @@ static void MakeMeshNormals( int width, int height, drawVert_t ctrl[MAX_GRID_SIZ
 
 				CrossProduct( around[(k+1)&7], around[k], normal );
 
-				if ( VectorNormalize2( normal, normal ) == 0 ) {
+				if ( VectorNormalize( normal ) < 0.001f ) {
 					continue;
 				}