Renderers: Replace PATCH_STITCHING preprocessor define with r_patchSt…

…itching cvar Cherrypicked: (JACoders@540edeb) Pull request: (JACoders#1199) Co-Authored-By: razor <844370+razish@users.noreply.github.com> (cherry picked from commit 3ae2bbd)
taysta · Apr 24, 2024 · 117c484 · 117c484
1 parent 9006f1b
commit 117c484
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/codemp/rd-dedicated/tr_init.cpp b/codemp/rd-dedicated/tr_init.cpp
@@ -211,8 +211,7 @@ Ghoul2 Insert End
 
 cvar_t *r_aviMotionJpegQuality;
 cvar_t *r_screenshotJpegQuality;
-
-cvar_t	*r_patchStitching;
+cvar_t *r_patchStitching;
 
 /*
 ** R_GetModeInfo
@@ -455,9 +454,7 @@ Ghoul2 Insert Start
 /*
 Ghoul2 Insert End
 */
-
 	r_patchStitching = ri.Cvar_Get("r_patchStitching", "1", CVAR_ARCHIVE, "Enable stitching of neighbouring patch surfaces" );
-
 	r_modelpoolmegs = ri.Cvar_Get("r_modelpoolmegs", "20", CVAR_ARCHIVE, "" );
 	if (ri.Sys_LowPhysicalMemory() )
 		ri.Cvar_Set("r_modelpoolmegs", "0");

diff --git a/codemp/rd-vanilla/tr_bsp.cpp b/codemp/rd-vanilla/tr_bsp.cpp
@@ -1393,13 +1393,13 @@ static	void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump, wor
 	}
 
 	if ( r_patchStitching->integer ) {
-		R_StitchAllPatches(worldData);
+		R_StitchAllPatches( worldData );
 	}
 
 	R_FixSharedVertexLodError(worldData);
 
 	if ( r_patchStitching->integer ) {
-		R_MovePatchSurfacesToHunk(worldData);
+		R_MovePatchSurfacesToHunk( worldData );
 	}
 
 	ri.Printf( PRINT_ALL, "...loaded %d faces, %i meshes, %i trisurfs, %i flares\n", numFaces, numMeshes, numTriSurfs, numFlares );

diff --git a/codemp/rd-vanilla/tr_init.cpp b/codemp/rd-vanilla/tr_init.cpp
@@ -220,7 +220,7 @@ cvar_t *se_language;
 cvar_t *r_aviMotionJpegQuality;
 cvar_t *r_screenshotJpegQuality;
 
-cvar_t	*r_patchStitching;
+cvar_t *r_patchStitching;
 
 #if !defined(__APPLE__)
 PFNGLSTENCILOPSEPARATEPROC qglStencilOpSeparate;

diff --git a/codemp/rd-vanilla/tr_local.h b/codemp/rd-vanilla/tr_local.h
@@ -1292,7 +1292,7 @@ extern	cvar_t	*r_noServerGhoul2;
 Ghoul2 Insert End
 */
 
-extern	cvar_t	*r_patchStitching;
+extern cvar_t *r_patchStitching;
 
 //====================================================================