From acc497114a93b15259f237c39e95c29e9be96b40 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Fri, 15 May 2020 04:11:36 +0200 Subject: [PATCH] q2map: do not define globally when used locally --- tools/quake2/q2map/qrad.c | 3 ++- tools/quake2/q2map/qrad.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/quake2/q2map/qrad.c b/tools/quake2/q2map/qrad.c index c17b5bb9..8726c0f3 100644 --- a/tools/quake2/q2map/qrad.c +++ b/tools/quake2/q2map/qrad.c @@ -582,7 +582,6 @@ void RadWorld( void ){ RunThreadsOnIndividual( numfaces, true, FinalLightFace ); } - /* ======== main @@ -603,6 +602,8 @@ int RAD_Main(){ start = I_FloatTime(); + void ( *CalcTextureReflectivity )( void ); + if ( !strcmp( game, "heretic2" ) ) { CalcTextureReflectivity = &CalcTextureReflectivity_Heretic2; } diff --git a/tools/quake2/q2map/qrad.h b/tools/quake2/q2map/qrad.h index 7f5df16c..66a4ec4d 100644 --- a/tools/quake2/q2map/qrad.h +++ b/tools/quake2/q2map/qrad.h @@ -172,7 +172,6 @@ void MakeTnodes( dmodel_t *bm ); void MakePatches( void ); void SubdividePatches( void ); void PairEdges( void ); -void ( *CalcTextureReflectivity )( void ); void CalcTextureReflectivity_Quake2( void ); void CalcTextureReflectivity_Heretic2( void ); -- 2.39.2