totally unlimit entities
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 17 Oct 2011 04:53:42 +0000 (06:53 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 17 Oct 2011 04:53:42 +0000 (06:53 +0200)
tools/quake3/q3map2/bspfile_abstract.c
tools/quake3/q3map2/map.c
tools/quake3/q3map2/q3map2.h

index ef78160f737ad15bd9e35586f09f33aafd53f54e..084b859867a4086e97b416fda4984ae0884277fe 100644 (file)
@@ -545,8 +545,7 @@ qboolean ParseEntity( void )
                return qfalse;
        if( strcmp( token, "{" ) )
                Error( "ParseEntity: { not found" );
-       if( numEntities == MAX_MAP_ENTITIES )
-               Error( "numEntities == MAX_MAP_ENTITIES" );
+       AUTOEXPAND_BY_REALLOC(entities, numEntities, allocatedEntities, 32);
        
        /* create new entity */
        mapEnt = &entities[ numEntities ];
index 9534bdb3111912190a8d972cb20133b116f6a4f1..12892573c354fd9c8b6e5b0349703117b2e75686 100644 (file)
@@ -1603,8 +1603,7 @@ static qboolean ParseMapEntity( qboolean onlyLights, qboolean noCollapseGroups )
        }
        
        /* range check */
-       if( numEntities >= MAX_MAP_ENTITIES )
-               Error( "numEntities == MAX_MAP_ENTITIES" );
+       AUTOEXPAND_BY_REALLOC(entities, numEntities, allocatedEntities, 32);
        
        /* setup */
        entitySourceBrushes = 0;
index 64494462e356e9dbfc3f175b2447730f2a52ee76..e86575e339d262362f9fbdf7cb6039ee06d29f8c 100644 (file)
@@ -317,9 +317,6 @@ abstracted bsp file
 #define MAX_LIGHTMAP_SHADERS   256
 
 /* ok to increase these at the expense of more memory */
-#define        MAX_MAP_ENTITIES                0x8000          //%     0x800   /* ydnar */
-#define        MAX_MAP_ENTSTRING               0x400000        //%     0x40000 /* ydnar */
-
 #define        MAX_MAP_AREAS                   0x100           /* MAX_MAP_AREA_BYTES in q_shared must match! */
 #define        MAX_MAP_FOGS                    30                      //& 0x100       /* RBSP (32 - world fog - goggles) */
 #define        MAX_MAP_LEAFS                   0x20000
@@ -2449,7 +2446,8 @@ abstracted bsp globals
 
 Q_EXTERN int                           numEntities Q_ASSIGN( 0 );
 Q_EXTERN int                           numBSPEntities Q_ASSIGN( 0 );
-Q_EXTERN entity_t                      entities[ MAX_MAP_ENTITIES ];
+Q_EXTERN int                           allocatedEntities Q_ASSIGN( 0 );
+Q_EXTERN entity_t*                     entities Q_ASSIGN(NULL);
 
 Q_EXTERN int                           numBSPModels Q_ASSIGN( 0 );
 Q_EXTERN int                           allocatedBSPModels Q_ASSIGN( 0 );