From e522e2d440c461b03eef0e8eddbfdea96e8d9479 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 6 Apr 2019 20:13:54 +0200 Subject: [PATCH] Fix #254 "Latest Autobuild has weird stuttering when jumping and moving" --- qcsrc/common/ent_cs.qc | 2 +- qcsrc/common/ent_cs.qh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc index c0a44b111..7a2ee20d6 100644 --- a/qcsrc/common/ent_cs.qc +++ b/qcsrc/common/ent_cs.qc @@ -148,7 +148,7 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL, ENTCS_PROP(SOLID, true, solid, ENTCS_SET_NORMAL, { WriteByte(chan, ent.solid); }, - { ent.solid = ReadByte(); }) + { ent.sv_solid = ReadByte(); }) #ifdef SVQC diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh index e44ccdabb..33bde3a60 100644 --- a/qcsrc/common/ent_cs.qh +++ b/qcsrc/common/ent_cs.qh @@ -7,6 +7,7 @@ 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; @@ -18,6 +19,8 @@ REGISTER_NET_TEMP(CLIENT_ENTCS) /** True when a recent server sent origin has been received */ .bool has_sv_origin; +.int sv_solid; +#endif #ifdef SVQC /* @@ -78,7 +81,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS) int fr = ((e) ? e.frags : stof(getplayerkeyvalue(i, "frags"))); if (unconnected || fr == FRAGS_SPECTATOR) return ENTCS_SPEC_PURE; - int sol = ((e) ? e.solid : SOLID_NOT); + 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; -- 2.39.2