Merge branch 'master' into terencehill/menu_optimization

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / net.qh

diff --git a/qcsrc/lib/net.qh b/qcsrc/lib/net.qh
index f6013f97a783c757060a65bf547c26ae22e5f24c..af914fc6482a2d0af6094b24e3f5e67313a7e3d6 100644 (file)
--- a/qcsrc/lib/net.qh
+++ b/qcsrc/lib/net.qh
@@ -5,6 +5,7 @@
        .int Version;  // deprecated, use SendFlags
        .int SendFlags;
        .bool(entity to, int sendflags) SendEntity;
+       /** return false to remove from the client */
        .bool(entity this, entity to, int sendflags) SendEntity3;
 
        bool SendEntity_self(entity to, int sendflags) { return self.SendEntity3(self, to, sendflags); }
@@ -30,10 +31,15 @@
                if (dt)
                {
                        e.nextthink = time + dt;
-                       e.think = SUB_Remove;
+                       e.think = SUB_Remove_self;
                }
        }
 
+       void Net_UnlinkEntity(entity e)
+       {
+               e.SendEntity = func_null;
+       }
+
        .void() uncustomizeentityforclient;
        .float uncustomizeentityforclient_set;
 
@@ -61,38 +67,36 @@
 
 #ifdef CSQC
        #define Net_Accept(classname) \
-               do \
+               MACRO_BEGIN \
                { \
                        if (!this)    this = new(classname); \
-               } \
-               while (0)
+               } MACRO_END
        #define Net_Reject() \
-               do \
+               MACRO_BEGIN \
                { \
                        if (this)     remove(this); \
-               } \
-               while (0)
+               } MACRO_END
        #define NET_HANDLE(id, param) \
                bool Net_Handle_##id(entity this, param)
 #else
        #define WriteHeader(to, id) \
-               do \
+               MACRO_BEGIN \
                { \
                        if (NET_##id##_istemp) WriteByte(to, SVC_TEMPENTITY); \
                        WriteByte(to, NET_##id.m_id); \
-               } \
-               while (0)
+               } MACRO_END
 #endif
 
 #ifdef CSQC
        #define REGISTER_NET_LINKED(id) \
-               [[accumulate]] NET_HANDLE(id, bool) \
+               [[accumulate]] NET_HANDLE(id, bool isnew) \
                { \
                        this = self; \
                        this.sourceLocFile = __FILE__; \
                        this.sourceLocLine = __LINE__; \
+                       if (!this) isnew = true; \
                } \
-               REGISTER(RegisterLinkedEntities, NET, LinkedEntities, id, m_id, new(net_linked_packet)) \
+               REGISTER(LinkedEntities, NET, id, m_id, new(net_linked_packet)) \
                { \
                        make_pure(this); \
                        this.netname = #id; \
@@ -101,7 +105,7 @@
 #else
        #define REGISTER_NET_LINKED(id) \
                const bool NET_##id##_istemp = false; \
-               REGISTER(RegisterLinkedEntities, NET, LinkedEntities, id, m_id, new(net_linked_packet)) \
+               REGISTER(LinkedEntities, NET, id, m_id, new(net_linked_packet)) \
                { \
                        make_pure(this); \
                        this.netname = #id; \
@@ -110,8 +114,8 @@
 
 REGISTRY(LinkedEntities, BITS(8) - 1)
 #define LinkedEntities_from(i) _LinkedEntities_from(i, NULL)
-REGISTER_REGISTRY(RegisterLinkedEntities)
-REGISTRY_SORT(LinkedEntities, 0)
+REGISTER_REGISTRY(LinkedEntities)
+REGISTRY_SORT(LinkedEntities)
 REGISTRY_CHECK(LinkedEntities)
 STATIC_INIT(RegisterLinkedEntities_renumber)
 {
@@ -122,7 +126,7 @@ STATIC_INIT(RegisterLinkedEntities_renumber)
 #ifdef CSQC
        #define REGISTER_NET_TEMP(id) \
                NET_HANDLE(id, bool); \
-               REGISTER(RegisterTempEntities, NET, TempEntities, id, m_id, new(net_temp_packet)) \
+               REGISTER(TempEntities, NET, id, m_id, new(net_temp_packet)) \
                { \
                        make_pure(this); \
                        this.netname = #id; \
@@ -131,7 +135,7 @@ STATIC_INIT(RegisterLinkedEntities_renumber)
 #else
        #define REGISTER_NET_TEMP(id) \
                const bool NET_##id##_istemp = true; \
-               REGISTER(RegisterTempEntities, NET, TempEntities, id, m_id, new(net_temp_packet)) \
+               REGISTER(TempEntities, NET, id, m_id, new(net_temp_packet)) \
                { \
                        make_pure(this); \
                        this.netname = #id; \
@@ -140,8 +144,8 @@ STATIC_INIT(RegisterLinkedEntities_renumber)
 
 REGISTRY(TempEntities, BITS(8) - 80)
 #define TempEntities_from(i) _TempEntities_from(i, NULL)
-REGISTER_REGISTRY(RegisterTempEntities)
-REGISTRY_SORT(TempEntities, 0)
+REGISTER_REGISTRY(TempEntities)
+REGISTRY_SORT(TempEntities)
 REGISTRY_CHECK(TempEntities)
 STATIC_INIT(RegisterTempEntities_renumber)
 {
@@ -154,7 +158,19 @@ STATIC_INIT(RegisterTempEntities_renumber)
        #define APPROXPASTTIME_MAX (16384 * APPROXPASTTIME_ACCURACY_REQUIREMENT)
        #define APPROXPASTTIME_RANGE (64 * APPROXPASTTIME_ACCURACY_REQUIREMENT)
 
+       #if defined(CSQC)
+               #define Read_float() ReadFloat()
+               #define Read_int() ReadInt24_t()
+               #define Read_string() ReadString()
+       #elif defined(SVQC)
+               #define Write_float(to, f) WriteFloat(to, f)
+               #define Write_int(to, f) WriteInt24_t(to, f)
+               #define Write_string(to, f) WriteString(to, f)
+       #endif
+
        #ifdef CSQC
+       #define ReadRegistry(r) r##_from(ReadByte())
+
                entity ReadCSQCEntity()
                {
                        int f = ReadShort();
@@ -184,6 +200,12 @@ STATIC_INIT(RegisterTempEntities_renumber)
                        return v;
                }
 
+               int _ReadSByte;
+               #define ReadSByte() (_ReadSByte = ReadByte(), (_ReadSByte & BIT(7) ? -128 : 0) + (_ReadSByte & BITS(7)))
+               #define ReadFloat() ReadCoord()
+        vector ReadVector() { vector v; v.x = ReadFloat(); v.y = ReadFloat(); v.z = ReadFloat(); return v; }
+               vector ReadVector2D() { vector v; v.x = ReadFloat(); v.y = ReadFloat(); v.z = 0; return v; }
+
                float ReadApproxPastTime()
                {
                        float dt = ReadByte();
@@ -197,6 +219,8 @@ STATIC_INIT(RegisterTempEntities_renumber)
        #else
                const int MSG_ENTITY = 5;
 
+               #define WriteRegistry(r, to, it) WriteByte(to, it.m_id)
+
                void WriteInt24_t(float dst, float val)
                {
                        float v;
@@ -215,6 +239,10 @@ STATIC_INIT(RegisterTempEntities_renumber)
                        WriteInt24_t(dst, val.z);
                }
 
+        #define WriteFloat(to, f) WriteCoord(to, f)
+               #define WriteVector(to, v) MACRO_BEGIN { WriteFloat(to, v.x); WriteFloat(to, v.y); WriteFloat(to, v.z); } MACRO_END
+        #define WriteVector2D(to, v) MACRO_BEGIN { WriteFloat(to, v.x); WriteFloat(to, v.y); } MACRO_END
+
                // this will use the value:
                //   128
                // accuracy near zero is APPROXPASTTIME_MAX/(256*255)
@@ -244,11 +272,10 @@ STATIC_INIT(RegisterTempEntities_renumber)
                        if (msg_entity == varname || (msg_entity.classname == STR_SPECTATOR && msg_entity.enemy == varname)) \
                                statement msg_entity = varname
                #define WRITESPECTATABLE_MSG_ONE(statement) \
-                       do \
+                       MACRO_BEGIN \
                        { \
                                WRITESPECTATABLE_MSG_ONE_VARNAME(oldmsg_entity, statement); \
-                       } \
-                       while (0)
+                       } MACRO_END
                #define WRITESPECTATABLE(msg, statement) \
                        if (msg == MSG_ONE) WRITESPECTATABLE_MSG_ONE(statement); \
                        else \