Merge remote-tracking branch 'origin/divVerent/leak-fix'

diff --combined tools/quake3/q3map2/q3map2.h
index f4b88d7a68c8ac1463217dd8fd9c95668a434aa2,abde6c8573ce2d022e3cc6bbb9fc7a60a0a98df5..49cdd11dafe297dc83f24faa4f32d2088cf9cca0
--- 1/tools/quake3/q3map2/q3map2.h
--- 2/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@@ -327,6 -327,7 +327,6 @@@ abstracted bsp fil
  #define       MAX_MAP_VISIBILITY              (VIS_HEADER_SIZE + MAX_MAP_VISCLUSTERS * (((MAX_MAP_VISCLUSTERS + 63) & ~63) >> 3))
  
  #define       MAX_MAP_DRAW_SURFS              0x20000
 -#define       MAX_MAP_DRAW_INDEXES    0x80000
  
  #define MAX_MAP_ADVERTISEMENTS        30
  
@@@ -1598,7 -1599,10 +1598,10 @@@ void                                          SplitNodePortals( node_t *nod
  
  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 );
@@@ -2510,11 -2514,10 +2513,11 @@@ Q_EXTERN int                         numBSPVisBytes Q_ASSIGN
  Q_EXTERN byte                         bspVisBytes[ MAX_MAP_VISIBILITY ];
  
  Q_EXTERN int                          numBSPDrawVerts Q_ASSIGN( 0 );
 -Q_EXTERN bspDrawVert_t                *bspDrawVerts Q_ASSIGN( NULL );
 +Q_EXTERN bspDrawVert_t                        *bspDrawVerts Q_ASSIGN( NULL );
  
  Q_EXTERN int                          numBSPDrawIndexes Q_ASSIGN( 0 );
 -Q_EXTERN int                          bspDrawIndexes[ MAX_MAP_DRAW_INDEXES ];
 +Q_EXTERN int                          allocatedBSPDrawIndexes Q_ASSIGN( 0 );
 +Q_EXTERN int                          *bspDrawIndexes Q_ASSIGN(NULL);
  
  Q_EXTERN int                          numBSPDrawSurfaces Q_ASSIGN( 0 );
  Q_EXTERN bspDrawSurface_t     *bspDrawSurfaces Q_ASSIGN( NULL );