X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fshownames.qc;h=165b033fb3558c8197e6e758b4dd4b39f3156f4e;hb=b7d363a108963ca13647ee25b58c5a531366cf49;hp=bfbba30fb8205a5e1352c9c74e1baa9f74ef705c;hpb=2aff8d6ec1d0c014f3ffecfffd51be23585b9587;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index bfbba30fb..165b033fb 100644
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -34,7 +34,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;
@@ -176,8 +176,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)
 		{