quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

q3map2 * allow maps with only point entity@( 0, 0, 0 )

Browse Source 
more informative prints
This commit is contained in:
Garux
2018-12-21 14:45:12 +03:00
parent 90d272e0a8
commit 5e50ac9ccf
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/quake3/q3map2/map.c
View File

@@ -854,11 +854,11 @@ brush_t *FinishBrush( qboolean noCollapseGroups ){
if ( buildBrush->compileFlags & C_ORIGIN ) {
vec3_t origin;
Sys_Printf( "Entity %i, Brush %i: origin brush detected\n",
mapEnt->mapEntityNum, entitySourceBrushes );
Sys_Printf( "Entity %i (%s), Brush %i: origin brush detected\n",
mapEnt->mapEntityNum, ValueForKey( mapEnt, "classname" ), entitySourceBrushes );
if ( numEntities == 1 ) {
Sys_Printf( "Entity %i, Brush %i: origin brushes not allowed in world\n",
Sys_FPrintf( SYS_WRN, "Entity %i, Brush %i: origin brushes not allowed in world\n",
mapEnt->mapEntityNum, entitySourceBrushes );
return NULL;
}
@@ -875,7 +875,7 @@ brush_t *FinishBrush( qboolean noCollapseGroups ){
/* determine if the brush is an area portal */
if ( buildBrush->compileFlags & C_AREAPORTAL ) {
if ( numEntities != 1 ) {
Sys_Printf( "Entity %i, Brush %i: areaportals only allowed in world\n", numEntities - 1, entitySourceBrushes );
Sys_FPrintf( SYS_WRN, "Entity %i (%s), Brush %i: areaportals only allowed in world\n", numEntities - 1, ValueForKey( mapEnt, "classname" ), entitySourceBrushes );
return NULL;
}
}

6
tools/quake3/q3map2/portals.c
View File

@@ -687,12 +687,12 @@ int FloodEntities( tree_t *tree ){
/* get origin */
GetVectorForKey( e, "origin", origin );
#if 0 //allow maps with only point entity@( 0, 0, 0 ); assuming that entities, containing no primitives are point ones
/* as a special case, allow origin-less entities */
if ( VectorCompare( origin, vec3_origin ) ) {
continue;
}
#endif
/* also allow bmodel entities outside, as they could be on a moving path that will go into the map */
if ( e->brushes != NULL || e->patches != NULL ) {
continue;
@@ -747,7 +747,7 @@ int FloodEntities( tree_t *tree ){
inside = qtrue;
}
if ( !r ) {
Sys_FPrintf( SYS_WRN, "Entity %i, Brush %i: Entity in solid\n", e->mapEntityNum, 0 );
Sys_FPrintf( SYS_WRN, "Entity %i (%s): Entity in solid\n", e->mapEntityNum, ValueForKey( e, "classname" ) );
}
else if ( tree->outside_node.occupied ) {
if ( !tripped || tree->outside_node.occupied < tripcount ) {