#pragma once
#ifdef CSQC
-#include <client/defs.qh>
+#include <client/csqcmodel_hooks.qh>
#endif
REGISTER_NET_LINKED(ENT_CLIENT_ENTCS)
REGISTER_NET_TEMP(CLIENT_ENTCS)
+#ifdef CSQC
/** True when private information such as origin is available */
.bool m_entcs_private;
/** True when origin is available */
-// FIXME: it seems sometimes this is false when observing even though observers should be able to know about all players
-// easily reproducible on heart_v2 or The_Yard with bots - might be because they lack waypoints and bots stand still
-// it has happened in matches with players and no bots but much more rarely
.bool has_origin;
/** True when a recent server sent origin has been received */
.bool has_sv_origin;
+#endif
+.int sv_solid;
#ifdef SVQC
/*
void entcs_think(entity this);
- void entcs_attach(entity e);
+ void entcs_attach(entity player);
- void entcs_detach(entity e);
+ void entcs_detach(entity player);
.int m_forceupdate;
-/** Force an origin update, for player sounds */
- #define entcs_force_origin(e) ((e).entcs.m_forceupdate = BIT(2))
+ void entcs_force_origin(entity player);
+
+ void entcs_update_players(entity player);
+
+ bool radar_showenemies;
#endif
* @param i zero indexed player
*/
.int frags;
- bool entcs_IsSpectating(int i)
+ const int ENTCS_SPEC_PURE = 1; // real spectator
+ const int ENTCS_SPEC_IN_SCOREBOARD = 2; // spectator but still in game (can be in a team)
+ #define entcs_IsSpectating(i) boolean(entcs_GetSpecState(i))
+
+ int entcs_GetSpecState(int i)
{
bool unconnected = !playerslots[i].gotscores;
entity e = entcs_receiver(i);
- return unconnected || ((e) ? e.frags : stof(getplayerkeyvalue(i, "frags"))) == FRAGS_SPECTATOR;
+ int fr = ((e) ? e.frags : stof(getplayerkeyvalue(i, "frags")));
+ if (unconnected || fr == FRAGS_SPECTATOR)
+ return ENTCS_SPEC_PURE;
+ int sol = ((e) ? e.sv_solid : SOLID_NOT);
+ if (fr == FRAGS_PLAYER_OUT_OF_GAME && sol == SOLID_NOT)
+ return ENTCS_SPEC_IN_SCOREBOARD;
+ return 0;
}
/**
/**
* @param i zero indexed player
- * @returns 0 if not teamplay | NUM_TEAM_##N | NUM_SPECTATOR
*/
int entcs_GetTeam(int i)
{
- return entcs_IsSpectating(i) ? NUM_SPECTATOR : entcs_GetTeamColor(i);
+ return (entcs_GetSpecState(i) == ENTCS_SPEC_PURE) ? NUM_SPECTATOR : entcs_GetTeamColor(i);
}
/**