From: terencehill <piuntn@gmail.com>
Date: Sun, 14 Mar 2021 16:11:47 +0000 (+0100)
Subject: Show number of entities found by cl/sv_cmd findat
X-Git-Tag: xonotic-v0.8.5~508
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8beec64997768a03f05b166a4b4af5a63cb9886c;p=xonotic%2Fxonotic-data.pk3dir.git

Show number of entities found by cl/sv_cmd findat
---

diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh
index 649894874..e63a7f04f 100644
--- a/qcsrc/common/debug.qh
+++ b/qcsrc/common/debug.qh
@@ -346,11 +346,11 @@ GENERIC_COMMAND(findent, "Search through entities for matching classname", false
 			int entcnt = 0;
 			FOREACH_ENTITY_CLASS_ORDERED(argv(1), true,
 			{
-				LOG_INFOF("%i (%s)", it, it.classname);
+				LOG_HELPF("%i (%s)", it, it.classname);
 				++entcnt;
 			});
 			if(entcnt)
-				LOG_INFOF("Found %d entities", entcnt);
+				LOG_HELPF("Found %d entities", entcnt);
 			return;
 		}
 
@@ -374,10 +374,21 @@ GENERIC_COMMAND(findat, "Search through entities for matching origin", false)
 		{
 			vector org = stov(argv(1));
 			float dist = stof(argv(2));
-			if (dist > 0)
-				FOREACH_ENTITY_ORDERED(vdist(it.origin - org, <, dist), LOG_HELPF("%i (%s)", it, it.classname));
-			else
-				FOREACH_ENTITY_ORDERED(it.origin == org, LOG_HELPF("%i (%s)", it, it.classname));
+			int entcnt = 0;
+			FOREACH_ENTITY_ORDERED(true,
+			{
+				if (dist > 0)
+				{
+					if (!vdist(it.origin - org, <, dist))
+						continue;
+				}
+				else if (it.origin != org)
+					continue;
+				LOG_HELPF("%i (%s)", it, it.classname);
+				++entcnt;
+			});
+			if(entcnt)
+				LOG_HELPF("Found %d entities", entcnt);
 			return;
 		}