Merge branch 'master' into TimePath/debug_draw

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

diff --git a/qcsrc/lib/net.qh b/qcsrc/lib/net.qh
index c3043806a58837829a475df8b4ebf29100321c83..35d5b38530fce4b929f50b182e988359955a2771 100644 (file)
--- a/qcsrc/lib/net.qh
+++ b/qcsrc/lib/net.qh
@@ -60,10 +60,10 @@
 .void(entity this, bool isNew)m_read;
 
 #ifdef CSQC
-       #define Net_Accept() \
+       #define Net_Accept(classname) \
                do \
                { \
-                       if (!this)    this = spawn(); \
+                       if (!this)    this = new(classname); \
                } \
                while (0)
        #define Net_Reject() \
@@ -87,9 +87,12 @@
                void Ent_Read##id(entity this, param) \
                { \
                        this = self; \
+                       this.sourceLocFile = __FILE__; \
+                       this.sourceLocLine = __LINE__; \
                } \
-               REGISTER(RegisterLinkedEntities, NET, LinkedEntities, id, m_id, spawn()) \
+               REGISTER(RegisterLinkedEntities, NET, LinkedEntities, id, m_id, new(net_linked_packet)) \
                { \
+                       make_pure(this); \
                        this.netname = #id; \
                        this.m_read = Ent_Read##id; \
                } \
@@ -97,26 +100,29 @@
 #else
        #define REGISTER_NET_LINKED(id, param) \
                const bool NET_##id##_istemp = false; \
-               REGISTER(RegisterLinkedEntities, NET, LinkedEntities, id, m_id, spawn()) \
+               REGISTER(RegisterLinkedEntities, NET, LinkedEntities, id, m_id, new(net_linked_packet)) \
                { \
+                       make_pure(this); \
                        this.netname = #id; \
                }
 #endif
 
-REGISTRY(LinkedEntities, BIT(0))
+REGISTRY(LinkedEntities, BITS(4))
+#define LinkedEntities_from(i) _LinkedEntities_from(i, NULL)
 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;
+               LinkedEntities_from(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()) \
+               REGISTER(RegisterTempEntities, NET, TempEntities, id, m_id, new(net_temp_packet)) \
                { \
+                       make_pure(this); \
                        this.netname = #id; \
                        this.m_read = Net_Read##id; \
                } \
@@ -124,19 +130,21 @@ STATIC_INIT(RegisterLinkedEntities_renumber)
 #else
        #define REGISTER_NET_TEMP(id, param) \
                const bool NET_##id##_istemp = true; \
-               REGISTER(RegisterTempEntities, NET, TempEntities, id, m_id, spawn()) \
+               REGISTER(RegisterTempEntities, NET, TempEntities, id, m_id, new(net_temp_packet)) \
                { \
+                       make_pure(this); \
                        this.netname = #id; \
                }
 #endif
 
-REGISTRY(TempEntities, BIT(0))
+REGISTRY(TempEntities, BITS(4))
+#define TempEntities_from(i) _TempEntities_from(i, NULL)
 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;
+               TempEntities_from(i).m_id = 115 + i;
 }
 
 #ifndef MENUQC
@@ -164,6 +172,8 @@ STATIC_INIT(RegisterTempEntities_renumber)
                        return v;
                }
        #else
+               const int MSG_ENTITY = 5;
+
                void WriteInt24_t(float dst, float val)
                {
                        float v;