X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fnet.qh;h=c9cdf6981b8533cf6eb85f88a478c8ee4150c8ea;hb=ba5af06cf3f399d5b454ec87473347820d81bd2e;hp=2994ea164bb1d58a9f9bee7e2a8a71ed9ad52d99;hpb=84257f628f8813521fa48917babd7fc121616180;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/net.qh b/qcsrc/lib/net.qh
index 2994ea164..c9cdf6981 100644
--- a/qcsrc/lib/net.qh
+++ b/qcsrc/lib/net.qh
@@ -40,10 +40,11 @@ string _net_prevmsgstr;
 #define REGISTER_NET_S2C(id) REGISTER_NET_TEMP(id)
 
 REGISTRY(TempEntities, BITS(8) - 80)
-#define TempEntities_from(i) _TempEntities_from(i, NULL)
 REGISTER_REGISTRY(TempEntities)
 REGISTRY_SORT(TempEntities)
 REGISTRY_CHECK(TempEntities)
+
+REGISTRY_DEFINE_GET(TempEntities, NULL)
 STATIC_INIT(TempEntities_renumber) { FOREACH(TempEntities, true, it.m_id = 80 + i); }
 
 
@@ -53,7 +54,7 @@ STATIC_INIT(TempEntities_renumber) { FOREACH(TempEntities, true, it.m_id = 80 +
 		ACCUMULATE NET_HANDLE(id, bool isnew) \
 		{ \
 			this = __self; \
-			this.sourceLoc = __FILE__ ":" STR(__LINE__); \
+			this.sourceLoc = __FILE__":"STR(__LINE__); \
 			if (!this) isnew = true; \
 		} \
 		NET_GUARD(id); \
@@ -72,10 +73,11 @@ STATIC_INIT(TempEntities_renumber) { FOREACH(TempEntities, true, it.m_id = 80 +
 #endif
 
 REGISTRY(LinkedEntities, BITS(8) - 1)
-#define LinkedEntities_from(i) _LinkedEntities_from(i, NULL)
 REGISTER_REGISTRY(LinkedEntities)
 REGISTRY_SORT(LinkedEntities)
 REGISTRY_CHECK(LinkedEntities)
+
+REGISTRY_DEFINE_GET(LinkedEntities, NULL)
 STATIC_INIT(LinkedEntities_renumber) { FOREACH(LinkedEntities, true, it.m_id = 1 + i); }
 
 
@@ -98,10 +100,11 @@ STATIC_INIT(LinkedEntities_renumber) { FOREACH(LinkedEntities, true, it.m_id = 1
 #endif
 
 REGISTRY(C2S_Protocol, BITS(8) - 1)
-#define C2S_Protocol_from(i) _C2S_Protocol_from(i, NULL)
 REGISTER_REGISTRY(C2S_Protocol)
 REGISTRY_SORT(C2S_Protocol)
 REGISTRY_CHECK(C2S_Protocol)
+
+REGISTRY_DEFINE_GET(C2S_Protocol, NULL)
 STATIC_INIT(C2S_Protocol_renumber) { FOREACH(C2S_Protocol, true, it.m_id = i); }
 
 #ifdef SVQC
@@ -114,7 +117,11 @@ STATIC_INIT(C2S_Protocol_renumber) { FOREACH(C2S_Protocol, true, it.m_id = i); }
 
 	void Net_LinkEntity(entity e, bool docull, float dt, bool(entity this, entity to, int sendflags) sendfunc)
 	{
-		if (e.classname == "") e.classname = "net_linked";
+		if (e.classname == "")
+		{
+		    LOG_WARN("Net_LinkEntity called on an entity without a classname, assigning default");
+		    e.classname = "net_linked";
+		}
 
 		if (e.model == "" || e.modelindex == 0)
 		{
@@ -170,7 +177,7 @@ STATIC_INIT(C2S_Protocol_renumber) { FOREACH(C2S_Protocol, true, it.m_id = i); }
 		STRING_ITERATOR_SET(g_buf, buf, 0);
 		for (int C2S; (C2S = ReadByte()) >= 0; )
 		{
-			entity reader = C2S_Protocol_from(C2S);
+			entity reader = REGISTRY_GET(C2S_Protocol, C2S);
 			if (reader && reader.m_read && reader.m_read(NULL, sender, true)) continue;
 			LOG_SEVEREF("Net_ClientCommand() with malformed C2S=%d", C2S);
 			return;
@@ -283,7 +290,7 @@ MACRO_END
 
 // serialization: old
 
-#define ReadRegistered(r) r##_from(Read_byte())
+#define ReadRegistered(r) REGISTRY_GET(r, Read_byte())
 #define WriteRegistered(r, to, it) Write_byte(to, it.m_id)
 
 #define Read_byte() ReadByte()
@@ -354,6 +361,15 @@ MACRO_END
 		#define ReadFloat() ReadCoord()
 		#define ReadVector() vec3(ReadFloat(), ReadFloat(), ReadFloat())
 		#define ReadVector2D() vec2(ReadFloat(), ReadFloat())
+		#define ReadAngleVector() vec3(ReadAngle(), ReadAngle(), ReadAngle())
+		#define ReadAngleVector2D() vec2(ReadAngle(), ReadAngle())
+
+		int Readbits(int num)
+		{
+			if (num > 16) return ReadInt24_t();
+			if (num > 8) return ReadShort();
+			return ReadByte();
+		}
 
 		float ReadApproxPastTime()
 		{
@@ -387,6 +403,15 @@ MACRO_END
 		#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
+		#define WriteAngleVector(to, v) MACRO_BEGIN WriteAngle(to, v.x); WriteAngle(to, v.y); WriteAngle(to, v.z); MACRO_END
+		#define WriteAngleVector2D(to, v) MACRO_BEGIN WriteAngle(to, v.x); WriteAngle(to, v.y); MACRO_END
+
+		void Writebits(float dst, float val, int num)
+		{
+			if (num > 16) { WriteInt24_t(dst, val); return; }
+			if (num > 8) { WriteShort(dst, val); return; }
+			WriteByte(dst, val);
+		}
 
 		// this will use the value:
 		//   128