Registry: overflow check

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

diff --git a/qcsrc/lib/net.qh b/qcsrc/lib/net.qh
index a41fae1443dd0429add1526545d839b33493bc97..2928ce84aabd6a7d8fe777674efd504b19f4fbb4 100644 (file)
--- a/qcsrc/lib/net.qh
+++ b/qcsrc/lib/net.qh
@@ -2,10 +2,14 @@
 #define NET_H
 
 #ifdef SVQC
+.int Version; // deprecated, use SendFlags
 .int SendFlags;
 .bool(entity to, int sendflags) SendEntity;
+.bool(entity this, entity to, int sendflags) SendEntity3;
 
-void Net_LinkEntity(entity e, bool docull, float dt, bool(entity to, int sendflags) sendfunc)
+bool SendEntity_self(entity to, int sendflags) { return self.SendEntity3(self, to, sendflags); }
+
+void Net_LinkEntity(entity e, bool docull, float dt, bool(entity this, entity to, int sendflags) sendfunc)
 {
     if (!e.classname) e.classname = "net_linked";
 
@@ -16,7 +20,8 @@ void Net_LinkEntity(entity e, bool docull, float dt, bool(entity to, int sendfla
         setsize(e, mi, ma);
     }
 
-    e.SendEntity = sendfunc;
+    e.SendEntity = SendEntity_self;
+    e.SendEntity3 = sendfunc;
     e.SendFlags = 0xFFFFFF;
 
     if (!docull) e.effects |= EF_NODEPTHTEST;
@@ -49,32 +54,67 @@ void UncustomizeEntitiesRun()
 #include "registry.qh"
 #include "sort.qh"
 
-REGISTRY(Linked, 24)
-
 .string netname;
 .int m_id;
 .void(entity this, bool isNew) m_read;
 
 #ifdef CSQC
-    #define REGISTER_LINKED(id, param) \
+    #define Net_Accept() do { if (!this)    this = spawn(); } while (0)
+    #define Net_Reject() do { if (this)     remove(this);   } while (0)
+#else
+    #define WriteHeader(to, id) do { \
+        if (NET_##id##_istemp) WriteByte(to, SVC_TEMPENTITY); \
+        WriteByte(to, NET_##id.m_id); \
+    } while (0)
+#endif
+
+#ifdef CSQC
+    #define REGISTER_NET_LINKED(id, param) \
         void Ent_Read##id(entity this, param) { this = self; } \
-        REGISTER(RegisterLinked, Linked, Linked, Linked_COUNT, id, m_id, spawn()) { \
+        REGISTER(RegisterLinkedEntities, NET, LinkedEntities, id, m_id, spawn()) { \
             this.netname = #id; \
             this.m_read = Ent_Read##id; \
         } \
         [[accumulate]] void Ent_Read##id(entity this, param)
 #else
-    #define REGISTER_LINKED(id, param) \
-        REGISTER(RegisterLinked, Linked, Linked, Linked_COUNT, id, m_id, spawn()) { \
+    #define REGISTER_NET_LINKED(id, param) \
+        const bool NET_##id##_istemp = false; \
+        REGISTER(RegisterLinkedEntities, NET, LinkedEntities, id, m_id, spawn()) { \
+            this.netname = #id; \
+        }
+#endif
+
+REGISTRY(LinkedEntities, BIT(0))
+REGISTER_REGISTRY(RegisterLinkedEntities)
+REGISTRY_SORT(LinkedEntities, netname, 0)
+STATIC_INIT(RegisterLinkedEntities_renumber) {
+    for (int i = 0; i < LinkedEntities_COUNT; ++i) {
+        LinkedEntities[i].m_id = 100 + i;
+    }
+}
+
+#ifdef CSQC
+    #define REGISTER_NET_TEMP(id, param) \
+        void Net_Read##id(entity this, param); \
+        REGISTER(RegisterTempEntities, NET, TempEntities, id, m_id, spawn()) { \
+            this.netname = #id; \
+            this.m_read = Net_Read##id; \
+        } \
+        void Net_Read##id(entity this, param)
+#else
+    #define REGISTER_NET_TEMP(id, param) \
+        const bool NET_##id##_istemp = true; \
+        REGISTER(RegisterTempEntities, NET, TempEntities, id, m_id, spawn()) { \
             this.netname = #id; \
         }
 #endif
 
-REGISTER_REGISTRY(RegisterLinked)
-REGISTRY_SORT(Linked, netname, 0)
-STATIC_INIT(RegisterLinked_renumber) {
-    for (int i = 0; i < Linked_COUNT; ++i) {
-        Linked[i].m_id = 100 + i;
+REGISTRY(TempEntities, BIT(0))
+REGISTER_REGISTRY(RegisterTempEntities)
+REGISTRY_SORT(TempEntities, netname, 0)
+STATIC_INIT(RegisterTempEntities_renumber) {
+    for (int i = 0; i < TempEntities_COUNT; ++i) {
+        TempEntities[i].m_id = 115 + i;
     }
 }