Fix #254 "Latest Autobuild has weird stuttering when jumping and moving"

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index c0a44b111477e1d688d486b15dd6836cc70a8827..7a2ee20d6566609e95c780d94418543fc83a11a4 100644 (file)
--- 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 e44ccdabbe897511371c8d5b4cbacf22491f120f..33bde3a6064b8ebcd951547a24d1fec60d9c553e 100644 (file)
--- 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;