another experimental change: better handle leaky maps

[xonotic/netradiant.git] / tools / quake3 / q3map2 / q3map2.h

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index b89497688d94c4632cafb29c9f057ec2afc27ef6..abde6c8573ce2d022e3cc6bbb9fc7a60a0a98df5 100644 (file)
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -142,7 +142,7 @@ constants
 #define DEF_RADIOSITY_BOUNCE   1.0f    /* ydnar: default to 100% re-emitted light */
 
 #define        MAX_SHADER_INFO                 8192
-#define MAX_CUST_SURFACEPARMS  64
+#define MAX_CUST_SURFACEPARMS  256
 
 #define        SHADER_MAX_VERTEXES             1000
 #define        SHADER_MAX_INDEXES              (6 * SHADER_MAX_VERTEXES)
@@ -567,6 +567,7 @@ typedef struct game_s
        float                           lightmapGamma;                                  /* default lightmap gamma */
        qboolean                        lightmapsRGB;                                   /* default lightmap sRGB mode */
        qboolean                        texturesRGB;                                    /* default texture sRGB mode */
+       qboolean                        colorsRGB;                                      /* default color sRGB mode */
        float                           lightmapExposure;                               /* default lightmap exposure */
        float                           lightmapCompensate;                             /* default lightmap compensate value */
        float                           gridScale;                                              /* vortex: default lightgrid scale (affects both directional and ambient spectres) */
@@ -1598,7 +1599,10 @@ void                                             SplitNodePortals( node_t *node );
 
 qboolean                                       PortalPassable( portal_t *p );
 
-qboolean                                       FloodEntities( tree_t *tree );
+#define FLOODENTITIES_LEAKED 1
+#define FLOODENTITIES_GOOD 0
+#define FLOODENTITIES_EMPTY -1
+int                                            FloodEntities( tree_t *tree );
 void                                           FillOutside( node_t *headnode);
 void                                           FloodAreas( tree_t *tree);
 face_t                                         *VisibleFaces( entity_t *e, tree_t *tree );
@@ -1807,7 +1811,7 @@ void                                              FloodLightRawLightmap( int num );
 void                                           IlluminateRawLightmap( int num );
 void                                           IlluminateVertexes( int num );
 
-void                                           SetupBrushesFlags( int mask, int test );
+void                                           SetupBrushesFlags( int mask_any, int test_any, int mask_all, int test_all );
 void                                           SetupBrushes( void );
 void                                           SetupClusters( void );
 qboolean                                       ClusterVisible( int a, int b );
@@ -1858,6 +1862,7 @@ void                                              EmitVertexRemapShader( char *from, char *to );
 
 void                                           LoadShaderInfo( void );
 shaderInfo_t                           *ShaderInfoForShader( const char *shader );
+shaderInfo_t                           *ShaderInfoForShaderNull( const char *shader );
 
 
 /* bspfile_abstract.c */
@@ -2224,6 +2229,7 @@ Q_EXTERN qboolean                 debugDeluxemap Q_ASSIGN( qfalse );
 Q_EXTERN int                           deluxemode Q_ASSIGN( 0 );       /* deluxemap format (0 - modelspace, 1 - tangentspace with renormalization, 2 - tangentspace without renormalization) */
 
 Q_EXTERN qboolean                      fast Q_ASSIGN( qfalse );
+Q_EXTERN qboolean                      fastpoint Q_ASSIGN( qtrue );
 Q_EXTERN qboolean                      faster Q_ASSIGN( qfalse );
 Q_EXTERN qboolean                      fastgrid Q_ASSIGN( qfalse );
 Q_EXTERN qboolean                      fastbounce Q_ASSIGN( qfalse );
@@ -2301,7 +2307,8 @@ Q_EXTERN qboolean                 inGrid Q_ASSIGN(0);
 Q_EXTERN float                         lightmapGamma Q_ASSIGN( 1.0f );
 Q_EXTERN float                         lightmapsRGB Q_ASSIGN( qfalse );
 Q_EXTERN float                         texturesRGB Q_ASSIGN( qfalse );
-Q_EXTERN float                         lightmapExposure Q_ASSIGN( 1.0f );
+Q_EXTERN float                         colorsRGB Q_ASSIGN( qfalse );
+Q_EXTERN float                         lightmapExposure Q_ASSIGN( 0.0f );
 Q_EXTERN float                         lightmapCompensate Q_ASSIGN( 1.0f );
 
 /* ydnar: for runtime tweaking of falloff tolerance */