X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fshownames.qc;h=add8992aab64f6d74e5305f13fbbe7cd9318aa47;hb=a565bc91f697fabe7af6931ef7a37db97edd5ebd;hp=050944dea0d3828ee355f5b2b16b9e0fc828831a;hpb=2487070c23bdcfc8ac60d414356ec43f52ec1a57;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 050944dea..add8992aa 100644
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -1,21 +1,23 @@
 #include "shownames.qh"
 
-#include "hud/all.qh"
+#include "hud/_mod.qh"
 
-#include "../common/constants.qh"
-#include "../common/mapinfo.qh"
-#include "../common/teams.qh"
+#include <common/ent_cs.qh>
+#include <common/constants.qh>
+#include <common/net_linked.qh>
+#include <common/mapinfo.qh>
+#include <common/teams.qh>
 
-#include "../lib/csqcmodel/cl_model.qh"
+#include <lib/csqcmodel/cl_model.qh>
 
-// self.isactive = player is in range and coordinates/status (health and armor) are up to date
-// self.origin = player origin
-// self.healthvalue
-// self.armorvalue
-// self.sameteam = player is on same team as local client
-// self.fadedelay = time to wait before name tag starts fading in for enemies
-// self.pointtime = last time you pointed at this player
-// self.csqcmodel_isdead = value of csqcmodel_isdead to know when the player is dead or not
+// this.isactive = player is in range and coordinates/status (health and armor) are up to date
+// this.origin = player origin
+// this.healthvalue
+// this.armorvalue
+// this.sameteam = player is on same team as local client
+// this.fadedelay = time to wait before name tag starts fading in for enemies
+// this.pointtime = last time you pointed at this player
+// this.csqcmodel_isdead = value of csqcmodel_isdead to know when the player is dead or not
 
 LinkedList shownames_ent;
 STATIC_INIT(shownames_ent)
@@ -23,8 +25,7 @@ STATIC_INIT(shownames_ent)
 	shownames_ent = LL_NEW();
 	for (int i = 0; i < maxclients; ++i)
 	{
-		entity e = new(shownames_tag);
-		make_pure(e);
+		entity e = new_pure(shownames_tag);
 		e.sv_entnum = i + 1;
 		LL_PUSH(shownames_ent, e);
 	}
@@ -34,7 +35,7 @@ const float SHOWNAMES_FADESPEED = 4;
 const float SHOWNAMES_FADEDELAY = 0.4;
 void Draw_ShowNames(entity this)
 {
-	if (this.sv_entnum == player_localentnum)  // self or spectatee
+	if (this.sv_entnum == (current_player + 1))  // self or spectatee
 		if (!(autocvar_hud_shownames_self && autocvar_chase_active)) return;
 	if (!this.sameteam && !autocvar_hud_shownames_enemies) return;
 	bool hit;
@@ -54,7 +55,11 @@ void Draw_ShowNames(entity this)
 	if (autocvar_hud_shownames_antioverlap)
 	{
 		// fade tag out if another tag that is closer to you overlaps
-		LL_EACH(shownames_ent, it != this && entcs_receiver(i), LAMBDA(
+		entity entcs = NULL;
+		LL_EACH(shownames_ent, it != this, {
+			entcs = entcs_receiver(i);
+			if (!(entcs && entcs.has_sv_origin))
+				continue;
 			vector eo = project_3d_to_2d(it.origin);
 			if (eo.z < 0 || eo.x < 0 || eo.y < 0 || eo.x > vid_conwidth || eo.y > vid_conheight) continue;
 			eo.z = 0;
@@ -64,7 +69,7 @@ void Draw_ShowNames(entity this)
 				overlap = true;
 				break;
 			}
-		));
+		});
 	}
 	bool onscreen = (o.z >= 0 && o.x >= 0 && o.y >= 0 && o.x <= vid_conwidth && o.y <= vid_conheight);
 	if (autocvar_hud_shownames_crosshairdistance)
@@ -168,7 +173,7 @@ void Draw_ShowNames(entity this)
 void Draw_ShowNames_All()
 {
 	if (!autocvar_hud_shownames) return;
-	LL_EACH(shownames_ent, true, LAMBDA(
+	LL_EACH(shownames_ent, true, {
 		entity entcs = entcs_receiver(i);
 		if (!entcs)
 		{
@@ -176,8 +181,8 @@ void Draw_ShowNames_All()
 			continue;
 		}
 		make_impure(it);
-		assert(entcs.think, eprint(entcs));
-		WITH(entity, self, entcs, entcs.think());
+		assert(getthink(entcs), eprint(entcs));
+		getthink(entcs)(entcs);
 		if (!entcs.has_origin) continue;
 		if (entcs.m_entcs_private)
 		{
@@ -195,5 +200,5 @@ void Draw_ShowNames_All()
 		if (!it.csqcmodel_isdead) setorigin(it, entcs.origin);
 		it.csqcmodel_isdead = dead;
 		Draw_ShowNames(it);
-	));
+	});
 }