andreas/sourcearena
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid conflict with gamma(3) in utils/vrad/vrad.h.

Browse Source 
The name of the global variable conflicts with the deprecated gamma function
from <math.h> on some systems. Additionally the variable appears to be
unused - should it rather just be deleted from the codebase?
This commit is contained in:
Jonas 'Sortie' Termansen 2013-08-12 14:37:24 +02:00
parent c5fb3851bb
commit b64d2e878c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mp/src/utils/vrad/vrad.cpp
View File

@ -93,7 +93,7 @@ bool g_bOnlyStaticProps = false;
bool g_bShowStaticPropNormals = false; bool g_bShowStaticPropNormals = false;
float gamma = 0.5; float gamma_value = 0.5;
float indirect_sun = 1.0; float indirect_sun = 1.0;
float reflectivityScale = 1.0; float reflectivityScale = 1.0;
qboolean do_extra = true; qboolean do_extra = true;

2
mp/src/utils/vrad/vrad.h
View File

@ -336,7 +336,7 @@ extern dface_t *g_pFaces;
extern bool g_bMPIProps; extern bool g_bMPIProps;
extern byte nodehit[MAX_MAP_NODES]; extern byte nodehit[MAX_MAP_NODES];
extern float gamma; extern float gamma_value;
extern float indirect_sun; extern float indirect_sun;
extern float smoothing_threshold; extern float smoothing_threshold;
extern int dlight_map; extern int dlight_map;

2
sp/src/utils/vrad/vrad.cpp
View File

@ -93,7 +93,7 @@ bool g_bOnlyStaticProps = false;
bool g_bShowStaticPropNormals = false; bool g_bShowStaticPropNormals = false;
float gamma = 0.5; float gamma_value = 0.5;
float indirect_sun = 1.0; float indirect_sun = 1.0;
float reflectivityScale = 1.0; float reflectivityScale = 1.0;
qboolean do_extra = true; qboolean do_extra = true;

2
sp/src/utils/vrad/vrad.h
View File

@ -336,7 +336,7 @@ extern dface_t *g_pFaces;
extern bool g_bMPIProps; extern bool g_bMPIProps;
extern byte nodehit[MAX_MAP_NODES]; extern byte nodehit[MAX_MAP_NODES];
extern float gamma; extern float gamma_value;
extern float indirect_sun; extern float indirect_sun;
extern float smoothing_threshold; extern float smoothing_threshold;
extern int dlight_map; extern int dlight_map;