Merge branch 'master' into martin-t/globals

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / ent_cs.qh

diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index e44ccdabbe897511371c8d5b4cbacf22491f120f..1546d7da49ab6aab437ac464c95789048ddcf331 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;
+#endif
+.int sv_solid;
 
 #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;