#include "shownames.qh"
-#include "hud/all.qh"
+#include "hud/_mod.qh"
#include <common/ent_cs.qh>
#include <common/constants.qh>
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;
void Draw_ShowNames_All()
{
- SELFPARAM();
if (!autocvar_hud_shownames) return;
LL_EACH(shownames_ent, true, {
entity entcs = entcs_receiver(i);
continue;
}
make_impure(it);
- assert(entcs.think, eprint(entcs));
- WITHSELF(entcs, entcs.think());
+ assert(getthink(entcs), eprint(entcs));
+ getthink(entcs)(entcs);
if (!entcs.has_origin) continue;
if (entcs.m_entcs_private)
{