From 5e50ac9ccfd3d50184f7a5d3d9a6974d67bff167 Mon Sep 17 00:00:00 2001
From: Garux <garux@mail.ru>
Date: Fri, 21 Dec 2018 14:45:12 +0300
Subject: [PATCH] q3map2	* allow maps with only point entity@( 0, 0, 0 ) more
 informative prints

---
 tools/quake3/q3map2/map.c     | 8 ++++----
 tools/quake3/q3map2/portals.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/quake3/q3map2/map.c b/tools/quake3/q3map2/map.c
index 69e573ad..2a11dd5e 100644
--- a/tools/quake3/q3map2/map.c
+++ b/tools/quake3/q3map2/map.c
@@ -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;
 		}
 	}
diff --git a/tools/quake3/q3map2/portals.c b/tools/quake3/q3map2/portals.c
index a9c5c1f7..b68f5298 100644
--- a/tools/quake3/q3map2/portals.c
+++ b/tools/quake3/q3map2/portals.c
@@ -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 ) {