quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove direct uses of MAIN_C macro

Browse Source
This commit is contained in:
Garux 2021-09-13 16:33:29 +03:00
parent 68b8d7d5dc
commit ef635cd95c
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/quake3/q3map2/q3map2.h
View File

@ -1904,12 +1904,7 @@ Q_EXTERN double distanceEpsilon Q_ASSIGN( 0.01 );
/* bsp */ /* bsp */
Q_EXTERN int numMapEntities Q_ASSIGN( 0 ); Q_EXTERN int numMapEntities Q_ASSIGN( 0 );
Q_EXTERN int blockSize[ 3 ] /* should be the same as in radiant */ inline int blockSize[ 3 ] = { 1024, 1024, 1024 }; /* should be the same as in radiant */
#ifndef MAIN_C
;
#else
= { 1024, 1024, 1024 };
#endif
Q_EXTERN char EnginePath[ 1024 ]; Q_EXTERN char EnginePath[ 1024 ];
@ -1956,11 +1951,7 @@ Q_EXTERN int numRedundantIndexes;
Q_EXTERN int numSurfaceModels Q_ASSIGN( 0 ); Q_EXTERN int numSurfaceModels Q_ASSIGN( 0 );
Q_EXTERN Vector3b debugColors[ 12 ] inline const Vector3b debugColors[ 12 ] =
#ifndef MAIN_C
;
#else
=
{ {
{ 255, 0, 0 }, { 255, 0, 0 },
{ 192, 128, 128 }, { 192, 128, 128 },
@ -1975,7 +1966,6 @@ Q_EXTERN Vector3b debugColors[ 12 ]
{ 0, 255, 0 }, { 0, 255, 0 },
{ 128, 192, 128 } { 128, 192, 128 }
}; };
#endif
Q_EXTERN int skyboxArea Q_ASSIGN( -1 ); Q_EXTERN int skyboxArea Q_ASSIGN( -1 );
Q_EXTERN Matrix4 skyboxTransform; Q_EXTERN Matrix4 skyboxTransform;
@ -2251,12 +2241,7 @@ Q_EXTERN int numVertsIlluminated Q_ASSIGN( 0 );
/* lightgrid */ /* lightgrid */
Q_EXTERN Vector3 gridMins; Q_EXTERN Vector3 gridMins;
Q_EXTERN int gridBounds[ 3 ]; Q_EXTERN int gridBounds[ 3 ];
Q_EXTERN Vector3 gridSize inline Vector3 gridSize = { 64, 64, 128 };
#ifndef MAIN_C
;
#else
= { 64, 64, 128 };
#endif