X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fq3map2.h;h=4220725d85417a6edbfe4fc813d0ec234e4265b4;hb=43455e1842d5346deaef95571cac95a3e24991b0;hp=46fec5eef2bed378f918ff73fe8b8a609ec34ee2;hpb=02a51890a3d97a0e937fbb11071cf7c41cc00aa9;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 46fec5ee..4220725d 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -48,11 +48,7 @@
    ------------------------------------------------------------------------------- */
 
 /* platform-specific */
-#if GDEF_OS_LINUX || GDEF_OS_MACOS
-	#define Q_UNIX
-#endif
-
-#ifdef Q_UNIX
+#if GDEF_OS_POSIX
 	#include <unistd.h>
 	#include <pwd.h>
 	#include <limits.h>
@@ -70,6 +66,9 @@
 #include "mathlib.h"
 #include "md5lib.h"
 #include "ddslib.h"
+#ifdef BUILD_CRUNCH
+#include "crn_rgba.h"
+#endif // BUILD_CRUNCH
 
 #include "picomodel.h"
 
@@ -90,21 +89,12 @@
 
    ------------------------------------------------------------------------------- */
 
-#define MAC_STATIC_HACK         0
-#if GDEF_OS_MACOS && MAC_STATIC_HACK
-	#define MAC_STATIC          static
+#if GDEF_OS_WINDOWS
+	#define Q_stricmp           stricmp
+	#define Q_strncasecmp       strnicmp
 #else
-	#define MAC_STATIC
-#endif
-
-#if 1
-	#if GDEF_OS_WINDOWS
-		#define Q_stricmp           stricmp
-		#define Q_strncasecmp       strnicmp
-	#else
-		#define Q_stricmp           strcasecmp
-		#define Q_strncasecmp       strncasecmp
-	#endif
+	#define Q_stricmp           strcasecmp
+	#define Q_strncasecmp       strncasecmp
 #endif
 
 /* macro version */
@@ -177,6 +167,21 @@
 #define C_DETAIL                0x08000000  /* THIS MUST BE THE SAME AS IN RADIANT! */
 
 
+/* new tex surface flags, like Smokin'Guns */
+#define TEX_SURF_METAL             0x00001000
+#define TEX_SURF_WOOD              0x00080000
+#define TEX_SURF_CLOTH             0x00100000
+#define TEX_SURF_DIRT              0x00200000
+#define TEX_SURF_GLASS             0x00400000
+#define TEX_SURF_PLANT             0x00800000
+#define TEX_SURF_SAND              0x01000000
+#define TEX_SURF_SNOW              0x02000000
+#define TEX_SURF_STONE             0x04000000
+#define TEX_SURF_WATER             0x08000000
+#define TEX_SURF_GRASS             0x10000000
+#define TEX_SURF_BREAKABLE         0x20000000
+
+
 /* shadow flags */
 #define WORLDSPAWN_CAST_SHADOWS 1
 #define WORLDSPAWN_RECV_SHADOWS 1
@@ -555,6 +560,7 @@ typedef struct game_s
 	int maxLMSurfaceVerts;                              /* default maximum meta surface verts */
 	int maxSurfaceVerts;                                /* default maximum surface verts */
 	int maxSurfaceIndexes;                              /* default maximum surface indexes (tris * 3) */
+	qboolean texFile;                                   /* enable per shader prefix surface flags and .tex file */
 	qboolean emitFlares;                                /* when true, emit flare surfaces */
 	char                *flareShader;                   /* default flare shader (MUST BE SET) */
 	qboolean wolfLight;                                 /* when true, lights work like wolf q3map  */
@@ -1852,7 +1858,7 @@ int                         ImportLightmapsMain( int argc, char **argv );
 
 void                        SetupSurfaceLightmaps( void );
 void                        StitchSurfaceLightmaps( void );
-void                        StoreSurfaceLightmaps( qboolean fastAllocate );
+void                        StoreSurfaceLightmaps( qboolean fastLightmapSearch );
 
 
 /* exportents.c */
@@ -1908,6 +1914,11 @@ void                        LoadBSPFile( const char *filename );
 void                        WriteBSPFile( const char *filename );
 void                        PrintBSPFileSizes( void );
 
+void                        WriteTexFile( char *name );
+void                        LoadSurfaceFlags( char *filename );
+int                         GetSurfaceParm( const char *tex );
+void                        RestoreSurfaceFlags( char *filename );
+
 epair_t                     *ParseEPair( void );
 void                        ParseEntities( void );
 void                        UnparseEntities( void );
@@ -1958,11 +1969,11 @@ Q_EXTERN game_t games[]
 	{
 								#include "game_quake3.h"
 	,
-								#include "game_quakelive.h" /* most be after game_quake3.h as they share defines! */
+								#include "game_quakelive.h" /* must be after game_quake3.h as they share defines! */
 	,
-								#include "game_nexuiz.h" /* most be after game_quake3.h as they share defines! */
+								#include "game_nexuiz.h" /* must be after game_quake3.h as they share defines! */
 	,
-								#include "game_xonotic.h" /* most be after game_quake3.h as they share defines! */
+								#include "game_xonotic.h" /* must be after game_quake3.h as they share defines! */
 	,
 								#include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */
 	,
@@ -1972,7 +1983,7 @@ Q_EXTERN game_t games[]
 	,
 								#include "game_wolf.h"
 	,
-								#include "game_wolfet.h" /* most be after game_wolf.h as they share defines! */
+								#include "game_wolfet.h" /* must be after game_wolf.h as they share defines! */
 	,
 								#include "game_etut.h"
 	,
@@ -1980,13 +1991,15 @@ Q_EXTERN game_t games[]
 	,
 								#include "game_sof2.h"
 	,
-								#include "game_jk2.h"   /* most be after game_sof2.h as they share defines! */
+								#include "game_jk2.h"   /* must be after game_sof2.h as they share defines! */
 	,
-								#include "game_ja.h"    /* most be after game_jk2.h as they share defines! */
+								#include "game_ja.h"    /* must be after game_jk2.h as they share defines! */
 	,
 								#include "game_qfusion.h"   /* qfusion game */
 	,
 								#include "game_reaction.h" /* must be after game_quake3.h */
+	,
+								#include "game_smokinguns.h" /* must be after game_quake3.h */
 	,
 								#include "game_darkplaces.h"    /* vortex: darkplaces q1 engine */
 	,
@@ -2554,6 +2567,9 @@ Q_EXTERN bspFog_t bspFogs[ MAX_MAP_FOGS ];
 Q_EXTERN int numBSPAds Q_ASSIGN( 0 );
 Q_EXTERN bspAdvertisement_t bspAds[ MAX_MAP_ADVERTISEMENTS ];
 
+// Used for tex file support, Smokin'Guns globals
+Q_EXTERN qboolean compile_map;
+
 #define AUTOEXPAND_BY_REALLOC( ptr, reqitem, allocated, def ) \
 	do \
 	{ \