totally unlimit entities

This commit is contained in:
Rudolf Polzer
2011-10-17 06:53:42 +02:00
parent f15b9265ec
commit 4b642e822f
3 changed files with 4 additions and 8 deletions

View 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 ];

View 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;

View 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 );