X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fq3map2.h;h=5721ae255ef06c70ce98c9ce4b93de95dcea28ab;hb=6790eb7048a160e04b84ee6305a9e830e23415d8;hp=20acad6e70469759ed374b06361cdb6a85b315fc;hpb=458a91b4539ea68ae6a02f5ad93c6fbc93a725a0;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 20acad6e..5721ae25 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -124,10 +124,10 @@
 /* general */
 #define MAX_QPATH               64
 
-#define MAX_IMAGES              512
+#define MAX_IMAGES              2048
 #define DEFAULT_IMAGE           "*default"
 
-#define MAX_MODELS              512
+#define MAX_MODELS              2048
 
 #define DEF_BACKSPLASH_FRACTION 0.05f   /* 5% backsplash by default */
 #define DEF_BACKSPLASH_DISTANCE 23
@@ -1874,7 +1874,7 @@ int                         ImportLightmapsMain( int argc, char **argv );
 
 void                        SetupSurfaceLightmaps( void );
 void                        StitchSurfaceLightmaps( void );
-void                        StoreSurfaceLightmaps( qboolean fastLightmapSearch, qboolean storeForReal );
+void                        StoreSurfaceLightmaps( qboolean fastAllocate, qboolean storeForReal );
 
 
 /* exportents.c */
@@ -1976,16 +1976,26 @@ Q_EXTERN game_t games[]
 	=
 	{
 								#include "game_quake3.h"
+	,
+								#include "game_nexuiz.h" /* must be after game_quake3.h as they share defines! */
+	,
+								#include "game_oa.h" /* must be after game_quake3.h as they share defines! */
+	,
+								#include "game_q3rally.h" /* must 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" /* must be after game_quake3.h as they share defines! */
+								#include "game_reaction.h" /* must be after game_quake3.h */
 	,
-								#include "game_xonotic.h" /* must be after game_quake3.h as they share defines! */
+								#include "game_smokinguns.h" /* must be after game_quake3.h */
 	,
-								#include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */
+								#include "game_tremulous.h" /* LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */
 	,
 								#include "game_unvanquished.h" /* must be after game_tremulous.h as they share defines! */
+	,
+								#include "game_wop.h" /* must 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_tenebrae.h"
 	,
@@ -1999,19 +2009,19 @@ Q_EXTERN game_t games[]
 	,
 								#include "game_sof2.h"
 	,
-								#include "game_jk2.h"   /* must 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"    /* must 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_qfusion.h" /* qfusion game */
 	,
-								#include "game_reaction.h" /* must be after game_quake3.h */
+								#include "game_warsow.h" /* must be after game_qfusion.h as they share defines! */
 	,
-								#include "game_smokinguns.h" /* must be after game_quake3.h */
+								#include "game_warfork.h" /* must be after game_qfusion.h as they share defines! */
 	,
-								#include "game_darkplaces.h"    /* vortex: darkplaces q1 engine */
+								#include "game_darkplaces.h" /* darkplaces q1 engine */
 	,
-								#include "game_dq.h"    /* vortex: deluxe quake game ( darkplaces q1 engine) */
+								#include "game_dq.h" /* deluxe quake game ( darkplaces q1 engine) */
 	,
 								#include "game_prophecy.h"  /* vortex: prophecy game ( darkplaces q1 engine) */
 	,