From 5577c98c8559333c2c81c3a5df78de9b12620c0a Mon Sep 17 00:00:00 2001
From: SomaZ <17459161+SomaZ@users.noreply.github.com>
Date: Thu, 4 Apr 2024 21:41:23 +0200
Subject: [PATCH] Fix some compiler warnings

Mostly unused variables
---
 code/rd-rend2/tr_init.cpp        | 11 ++++++-----
 shared/rd-rend2/tr_animation.cpp |  3 ++-
 shared/rd-rend2/tr_backend.cpp   |  4 ++--
 shared/rd-rend2/tr_cache.cpp     |  1 +
 shared/rd-rend2/tr_ghoul2.cpp    |  3 ++-
 shared/rd-rend2/tr_main.cpp      |  4 ++--
 shared/rd-rend2/tr_mesh.cpp      |  4 ++--
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/code/rd-rend2/tr_init.cpp b/code/rd-rend2/tr_init.cpp
index 08bda041fc..43a7ce2f83 100644
--- a/code/rd-rend2/tr_init.cpp
+++ b/code/rd-rend2/tr_init.cpp
@@ -1122,17 +1122,18 @@ RB_TakeVideoFrameCmd
 const void *RB_TakeVideoFrameCmd( const void *data )
 {
 	const videoFrameCommand_t	*cmd;
-	byte				*cBuf;
-	size_t				memcount, linelen;
-	int				padwidth, avipadwidth, padlen, avipadlen;
-	GLint packAlign;
-
+	
 	// finish any 2D drawing if needed
 	if (tess.numIndexes)
 		RB_EndSurface();
 
 	cmd = (const videoFrameCommand_t *)data;
 #ifndef REND2_SP
+	byte				*cBuf;
+	size_t				memcount, linelen;
+	int				padwidth, avipadwidth, padlen, avipadlen;
+	GLint packAlign;
+
 	qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign);
 
 	linelen = cmd->width * 3;
diff --git a/shared/rd-rend2/tr_animation.cpp b/shared/rd-rend2/tr_animation.cpp
index 63af468f08..e054cb0d8f 100644
--- a/shared/rd-rend2/tr_animation.cpp
+++ b/shared/rd-rend2/tr_animation.cpp
@@ -136,7 +136,7 @@ R_MDRComputeFogNum
 */
 
 int R_MDRComputeFogNum( mdrHeader_t *header, trRefEntity_t *ent ) {
-	int				i, j;
+	int				i;
 	float			frameRadius;
 	fog_t			*fog;
 	mdrFrame_t		*mdrFrame;
@@ -154,6 +154,7 @@ int R_MDRComputeFogNum( mdrHeader_t *header, trRefEntity_t *ent ) {
 	VectorAdd( ent->e.origin, mdrFrame->localOrigin, localOrigin );
 	frameRadius = mdrFrame->radius;
 #ifndef REND2_SP
+	int j;
 	for (i = 1; i < tr.world->numfogs; i++) {
 		fog = &tr.world->fogs[i];
 		for (j = 0; j < 3; j++) {
diff --git a/shared/rd-rend2/tr_backend.cpp b/shared/rd-rend2/tr_backend.cpp
index 0009e72003..6ff66ee93c 100644
--- a/shared/rd-rend2/tr_backend.cpp
+++ b/shared/rd-rend2/tr_backend.cpp
@@ -2139,7 +2139,7 @@ static void RB_RenderMainPass( drawSurf_t *drawSurfs, int numDrawSurfs )
 
 	if (r_drawSun->integer)
 	{
-		RB_DrawSun(0.1, tr.sunShader);
+		RB_DrawSun(0.1f, tr.sunShader);
 	}
 
 	if (r_drawSunRays->integer)
@@ -2153,7 +2153,7 @@ static void RB_RenderMainPass( drawSurf_t *drawSurfs, int numDrawSurfs )
 		tr.sunFlareQueryActive[tr.sunFlareQueryIndex] = qtrue;
 		qglBeginQuery(GL_SAMPLES_PASSED, tr.sunFlareQuery[tr.sunFlareQueryIndex]);
 
-		RB_DrawSun(0.3, tr.sunFlareShader);
+		RB_DrawSun(0.3f, tr.sunFlareShader);
 
 		qglEndQuery(GL_SAMPLES_PASSED);
 
diff --git a/shared/rd-rend2/tr_cache.cpp b/shared/rd-rend2/tr_cache.cpp
index df62c616e6..2ec9ccb8e1 100644
--- a/shared/rd-rend2/tr_cache.cpp
+++ b/shared/rd-rend2/tr_cache.cpp
@@ -185,6 +185,7 @@ void CModelCacheManager::DumpNonPure( void )
 		int iInPak = ri.FS_FileIsInPAK( it->path, &iChecksum );
 #else
 		int iInPak = ri.FS_FileIsInPAK(it->path);
+		iChecksum = it->iPAKChecksum;
 #endif
 
 		if( iInPak == -1 || iChecksum != it->iPAKChecksum )
diff --git a/shared/rd-rend2/tr_ghoul2.cpp b/shared/rd-rend2/tr_ghoul2.cpp
index 409dc613f6..ad62a936fc 100644
--- a/shared/rd-rend2/tr_ghoul2.cpp
+++ b/shared/rd-rend2/tr_ghoul2.cpp
@@ -925,7 +925,7 @@ R_AComputeFogNum
 */
 static int R_GComputeFogNum( trRefEntity_t *ent ) {
 
-	int				i, j;
+	int				i;
 	float			frameRadius;
 	fog_t			*fog;
 	vec3_t			localOrigin;
@@ -937,6 +937,7 @@ static int R_GComputeFogNum( trRefEntity_t *ent ) {
 	VectorCopy(ent->e.origin, localOrigin);
 	frameRadius = ent->e.radius;
 #ifndef REND2_SP
+	int j;
 	for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
 		fog = &tr.world->fogs[i];
 		for ( j = 0 ; j < 3 ; j++ ) {
diff --git a/shared/rd-rend2/tr_main.cpp b/shared/rd-rend2/tr_main.cpp
index 4c4ed5ae71..e0a4e36a6c 100644
--- a/shared/rd-rend2/tr_main.cpp
+++ b/shared/rd-rend2/tr_main.cpp
@@ -1654,7 +1654,7 @@ See if a sprite is inside a fog volume
 =================
 */
 int R_SpriteFogNum( trRefEntity_t *ent ) {
-	int				i, j;
+	int				i;
 	float			frameRadius;
 	fog_t			*fog;
 	vec3_t			localOrigin;
@@ -1666,6 +1666,7 @@ int R_SpriteFogNum( trRefEntity_t *ent ) {
 	VectorCopy(ent->e.origin, localOrigin);
 	frameRadius = ent->e.radius;
 #ifndef REND2_SP
+	int j;
 	for (i = 1; i < tr.world->numfogs; i++) {
 		fog = &tr.world->fogs[i];
 		for (j = 0; j < 3; j++) {
@@ -2300,7 +2301,6 @@ void R_SetupViewParmsForOrthoRendering(
 
 void R_SetupPshadowMaps(trRefdef_t *refdef)
 {
-	viewParms_t		shadowParms;
 	int i;
 
 	// first, make a list of shadows
diff --git a/shared/rd-rend2/tr_mesh.cpp b/shared/rd-rend2/tr_mesh.cpp
index a2e4d1ac43..46fbc071ab 100644
--- a/shared/rd-rend2/tr_mesh.cpp
+++ b/shared/rd-rend2/tr_mesh.cpp
@@ -168,7 +168,6 @@ RE_GetModelBounds
 void RE_GetModelBounds(refEntity_t *refEnt, vec3_t bounds1, vec3_t bounds2)
 {
 	mdvFrame_t		*frame;
-	md3Header_t		*header;
 	model_t			*model;
 
 	assert(refEnt);
@@ -269,7 +268,7 @@ R_ComputeFogNum
 =================
 */
 int R_ComputeFogNum( mdvModel_t *model, trRefEntity_t *ent ) {
-	int				i, j;
+	int				i;
 	float			frameRadius;
 	fog_t			*fog;
 	mdvFrame_t		*mdvFrame;
@@ -284,6 +283,7 @@ int R_ComputeFogNum( mdvModel_t *model, trRefEntity_t *ent ) {
 	VectorAdd( ent->e.origin, mdvFrame->localOrigin, localOrigin );
 	frameRadius = mdvFrame->radius;
 #ifndef REND2_SP
+	int j;
 	for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
 		fog = &tr.world->fogs[i];
 		for ( j = 0 ; j < 3 ; j++ ) {