From: Thomas Debesse <dev@illwieckz.net>
Date: Tue, 26 May 2020 15:37:18 +0000 (+0200)
Subject: Merge commit 'ed4c8c204443726e852a4c8927b3f8d2571cc522' into garux-merge
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=ddee6cbe7c5fcbba52e7881a411f310809b867f9

Merge commit 'ed4c8c204443726e852a4c8927b3f8d2571cc522' into garux-merge
---

ddee6cbe7c5fcbba52e7881a411f310809b867f9
diff --cc tools/quake3/q3map2/exportents.c
index b1236608,578f9e42..a0e5d6b6
--- a/tools/quake3/q3map2/exportents.c
+++ b/tools/quake3/q3map2/exportents.c
@@@ -109,4 -109,4 +109,4 @@@ int ExportEntitiesMain( int argc, char 
  		
          /* return to sender */
          return 0;
--}
++}
diff --cc tools/quake3/q3map2/path_init.c
index f8d97804,b953377a..66f256b4
--- a/tools/quake3/q3map2/path_init.c
+++ b/tools/quake3/q3map2/path_init.c
@@@ -530,16 -507,17 +531,6 @@@ void InitPaths( int *argc, char **argv 
  			homeBasePath = ".";
  			argv[ i ] = NULL;
  		}
--
--		/* -fs_pakpath */
--		else if ( strcmp( argv[ i ], "-fs_pakpath" ) == 0 ) {
--			if ( ++i >= *argc ) {
--				Error( "Out of arguments: No path specified after %s.", argv[ i - 1 ] );
--			}
--			argv[ i - 1 ] = NULL;
--			AddPakPath( argv[ i ] );
--			argv[ i ] = NULL;
--		}
 -
  	}
  
  	/* remove processed arguments */
diff --cc tools/quake3/q3map2/q3map2.h
index f6296f1b,e6d0e1f7..a230dd00
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@@ -1860,14 -1840,14 +1860,19 @@@ int                         ImportLight
  
  void                        SetupSurfaceLightmaps( void );
  void                        StitchSurfaceLightmaps( void );
 -void                        StoreSurfaceLightmaps( void );
 +void                        StoreSurfaceLightmaps( qboolean fastAllocate );
 +
 +
 +/* exportents.c */
 +void                        ExportEntities( void );
 +int                         ExportEntitiesMain( int argc, char **argv );
  
  
+ /* exportents.c */
+ void                        ExportEntities( void );
+ int                         ExportEntitiesMain( int argc, char **argv );
+ 
+ 
  /* image.c */
  void                        ImageFree( image_t *image );
  image_t                     *ImageFind( const char *filename );