Net: register all types

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

diff --git a/qcsrc/lib/net.qh b/qcsrc/lib/net.qh
index 35d5b38530fce4b929f50b182e988359955a2771..0acba4e66c06287277ab359d583070295322a1b6 100644 (file)
--- a/qcsrc/lib/net.qh
+++ b/qcsrc/lib/net.qh
@@ -57,7 +57,7 @@
 
 .string netname;
 .int m_id;
-.void(entity this, bool isNew)m_read;
+.bool(entity this, bool isNew) m_read;
 
 #ifdef CSQC
        #define Net_Accept(classname) \
@@ -72,6 +72,8 @@
                        if (this)     remove(this); \
                } \
                while (0)
+       #define NET_HANDLE(id, param) \
+               bool Net_Handle_##id(entity this, param)
 #else
        #define WriteHeader(to, id) \
                do \
@@ -83,8 +85,8 @@
 #endif
 
 #ifdef CSQC
-       #define REGISTER_NET_LINKED(id, param) \
-               void Ent_Read##id(entity this, param) \
+       #define REGISTER_NET_LINKED(id) \
+               [[accumulate]] NET_HANDLE(id, bool) \
                { \
                        this = self; \
                        this.sourceLocFile = __FILE__; \
@@ -94,11 +96,10 @@
                { \
                        make_pure(this); \
                        this.netname = #id; \
-                       this.m_read = Ent_Read##id; \
-               } \
-               [[accumulate]] void Ent_Read##id(entity this, param)
+                       this.m_read = Net_Handle_##id; \
+               }
 #else
-       #define REGISTER_NET_LINKED(id, param) \
+       #define REGISTER_NET_LINKED(id) \
                const bool NET_##id##_istemp = false; \
                REGISTER(RegisterLinkedEntities, NET, LinkedEntities, id, m_id, new(net_linked_packet)) \
                { \
@@ -107,28 +108,27 @@
                }
 #endif
 
-REGISTRY(LinkedEntities, BITS(4))
+REGISTRY(LinkedEntities, BITS(8) - 1)
 #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_from(i).m_id = 100 + i;
+               LinkedEntities_from(i).m_id = 1 + i;
 }
 
 #ifdef CSQC
-       #define REGISTER_NET_TEMP(id, param) \
-               void Net_Read##id(entity this, param); \
+       #define REGISTER_NET_TEMP(id) \
+               NET_HANDLE(id, bool); \
                REGISTER(RegisterTempEntities, NET, TempEntities, id, m_id, new(net_temp_packet)) \
                { \
                        make_pure(this); \
                        this.netname = #id; \
-                       this.m_read = Net_Read##id; \
-               } \
-               void Net_Read##id(entity this, param)
+                       this.m_read = Net_Handle_##id; \
+               }
 #else
-       #define REGISTER_NET_TEMP(id, param) \
+       #define REGISTER_NET_TEMP(id) \
                const bool NET_##id##_istemp = true; \
                REGISTER(RegisterTempEntities, NET, TempEntities, id, m_id, new(net_temp_packet)) \
                { \
@@ -137,14 +137,14 @@ STATIC_INIT(RegisterLinkedEntities_renumber)
                }
 #endif
 
-REGISTRY(TempEntities, BITS(4))
+REGISTRY(TempEntities, 128)
 #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_from(i).m_id = 115 + i;
+               TempEntities_from(i).m_id = 100 + i;
 }
 
 #ifndef MENUQC
@@ -191,6 +191,11 @@ STATIC_INIT(RegisterTempEntities_renumber)
                        WriteInt24_t(dst, val.y);
                        WriteInt24_t(dst, val.z);
                }
+
+               // allow writing to also pass through to spectators (like so spectators see the same centerprints as players for example)
+        #define WRITESPECTATABLE_MSG_ONE_VARNAME(varname,statement) entity varname; varname = msg_entity; FOR_EACH_REALCLIENT(msg_entity) if(msg_entity == varname || (msg_entity.classname == STR_SPECTATOR && msg_entity.enemy == varname)) statement msg_entity = varname
+        #define WRITESPECTATABLE_MSG_ONE(statement) WRITESPECTATABLE_MSG_ONE_VARNAME(oldmsg_entity, statement)
+        #define WRITESPECTATABLE(msg,statement) if(msg == MSG_ONE) { WRITESPECTATABLE_MSG_ONE(statement); } else statement float WRITESPECTATABLE_workaround = 0
        #endif
 #endif