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

player class: Use parent method OptimiseChangedFlags() to cull some fields from being networked to players other than yourself

This commit is contained in:
Marco Cawthorne 2022-08-09 09:33:09 -07:00
parent 023eccce5f
commit 8b138494c8
Signed by: eukara
GPG Key ID: CE2032F0A2882A22
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/shared/player.qc
View File

@ -262,54 +262,32 @@ player::SendEntity
=================
*/
float
player::SendEntity(entity ePEnt, float fChanged)
player::SendEntity(entity ePEnt, float flChanged)
{
bool is_spec = false;
bool spectarget = false;
/* don't broadcast invisible players */
if (IsFakeSpectator() && ePEnt != this)
return (0);
if (!GetModelindex() && ePEnt != this)
return (0);
/* 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_TIMINGS;
fChanged &= ~PLAYER_AMMO1;
fChanged &= ~PLAYER_AMMO2;
fChanged &= ~PLAYER_AMMO3;
fChanged &= ~PLAYER_FLAGS;
fChanged &= ~PLAYER_PUNCHANGLE;
fChanged &= ~PLAYER_VIEWZOOM;
fChanged &= ~PLAYER_SPECTATE;
}
flChanged = OptimiseChangedFlags(ePEnt, flChanged);
WriteByte(MSG_ENTITY, ENT_PLAYER);
WriteFloat(MSG_ENTITY, fChanged);
WriteFloat(MSG_ENTITY, flChanged);
NSClientPlayer::SendEntity(ePEnt, fChanged);
NSClientPlayer::SendEntity(ePEnt, flChanged);
if (fChanged & PLAYER_TOPFRAME) {
if (flChanged & PLAYER_TOPFRAME) {
WriteByte(MSG_ENTITY, anim_top);
WriteFloat(MSG_ENTITY, anim_top_time);
WriteFloat(MSG_ENTITY, anim_top_delay);
}
if (fChanged & PLAYER_BOTTOMFRAME) {
if (flChanged & PLAYER_BOTTOMFRAME) {
WriteByte(MSG_ENTITY, anim_bottom);
WriteFloat(MSG_ENTITY, anim_bottom_time);
}
if (fChanged & PLAYER_AMMO1) {
if (flChanged & PLAYER_AMMO1) {
WriteByte(MSG_ENTITY, bradnailer_mag);
WriteByte(MSG_ENTITY, nailgun_mag);
WriteByte(MSG_ENTITY, shotgun_mag);
@ -318,7 +296,7 @@ player::SendEntity(entity ePEnt, float fChanged)
WriteByte(MSG_ENTITY, satchel_chg);
}
if (fChanged & PLAYER_AMMO2) {
if (flChanged & PLAYER_AMMO2) {
WriteByte(MSG_ENTITY, ammo_nail);
WriteByte(MSG_ENTITY, ammo_buckshot);
WriteByte(MSG_ENTITY, ammo_bolts);
@ -326,7 +304,7 @@ player::SendEntity(entity ePEnt, float fChanged)
WriteByte(MSG_ENTITY, ammo_satchel);
}
if (fChanged & PLAYER_AMMO3) {
if (flChanged & PLAYER_AMMO3) {
WriteByte(MSG_ENTITY, mode_tempstate);
}