nuclide-ports/scihunt
nuclide-ports
/
scihunt
3
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Clean up our player enumflags.

This commit is contained in:
Marco Cawthorne 2022-08-07 14:13:35 -07:00
parent 6b4c63965c
commit 6c19e76e78
Signed by: eukara
GPG Key ID: CE2032F0A2882A22
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/shared/player.qc
View File

@ -17,29 +17,14 @@
/* all potential SendFlags bits we can possibly send */
enumflags
{
PLAYER_KEEPALIVE,
PLAYER_MODELINDEX,
PLAYER_ORIGIN,
PLAYER_ORIGIN_Z,
PLAYER_ANGLES_X,
PLAYER_ANGLES_Y,
PLAYER_COLORMAP,
PLAYER_VELOCITY,
PLAYER_VELOCITY_Z,
PLAYER_FLAGS,
PLAYER_WEAPON,
PLAYER_ITEMS,
PLAYER_HEALTH,
PLAYER_ARMOR,
PLAYER_MOVETYPE,
PLAYER_VIEWOFS,
PLAYER_TOPFRAME,
PLAYER_TOPFRAME = PLAYER_CUSTOMFIELDSTART,
PLAYER_BOTTOMFRAME,
PLAYER_AMMO1,
PLAYER_AMMO2,
PLAYER_AMMO3,
PLAYER_UNUSED1,
PLAYER_UNUSED2
PLAYER_UNUSED5,
PLAYER_UNUSED6,
PLAYER_UNUSED7
};
class player:NSClientPlayer
@ -177,7 +162,7 @@ player::ReceiveEntity(float new, float fl)
HUD_AmmoNotify_Check(this);
}
if (fl & PLAYER_ITEMS || fl & PLAYER_HEALTH || fl & PLAYER_ARMOR)
if (fl & PLAYER_ITEMS || fl & PLAYER_HEALTH)
HUD_ItemNotify_Check(this);
}
@ -402,20 +387,34 @@ player::SendEntity
float
player::SendEntity(entity ePEnt, float fChanged)
{
bool is_spec = false;
bool spectarget = false;
/* don't broadcast invisible players */
if (IsFakeSpectator() && ePEnt != this)
return (0);
if (!GetModelindex() && ePEnt != this)
return (0);
if (ePEnt != self) {
/* figure out if we should optimise this player */
if (ePEnt.flags & FL_CLIENT && ePEnt != this) {
NSClientSpectator sp = (NSClientSpectator)ePEnt;
is_spec = (sp.IsFakeSpectator() || sp.IsRealSpectator());
spectarget = (is_spec == true && edict_num(sp.spec_ent) == this);
}
/* if we're a spectator of any type and spectate this player */
if (ePEnt != this && spectarget == false) {
fChanged &= ~PLAYER_ITEMS;
fChanged &= ~PLAYER_HEALTH;
fChanged &= ~PLAYER_ARMOR;
fChanged &= ~PLAYER_VIEWOFS;
fChanged &= ~PLAYER_TIMINGS;
fChanged &= ~PLAYER_AMMO1;
fChanged &= ~PLAYER_AMMO2;
fChanged &= ~PLAYER_AMMO3;
fChanged &= ~PLAYER_FLAGS;
fChanged &= ~PLAYER_PUNCHANGLE;
fChanged &= ~PLAYER_VIEWZOOM;
fChanged &= ~PLAYER_SPECTATE;
}
WriteByte(MSG_ENTITY, ENT_PLAYER);

2
src/shared/w_hammer.qc
View File

@ -225,7 +225,7 @@ void w_hammer_hudpic(player pl, int s, vector pos, float a)
weapon_t w_hammer =
{
.name = "hammer",
.id = ITEM_HAMMER,
.id = ITEM_HAMMER,
.slot = 0,
.slot_pos = 1,
.draw = w_hammer_draw,