From f67729df5b4ea2941c78db98224f02b2c8d55340 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Sun, 7 Aug 2022 14:14:42 -0700 Subject: [PATCH] Clean up our player enumflags. --- src/shared/player.h | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/shared/player.h b/src/shared/player.h index b37ef0d..324e60b 100644 --- a/src/shared/player.h +++ b/src/shared/player.h @@ -14,25 +14,10 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* 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, @@ -526,10 +511,14 @@ player::SendEntity(entity ePEnt, float fChanged) if (ePEnt != self) { fChanged &= ~PLAYER_ITEMS; fChanged &= ~PLAYER_HEALTH; - fChanged &= ~PLAYER_ARMOR; + 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);