From: Mario <mario@smbclan.net>
Date: Wed, 28 Jun 2017 09:16:26 +0000 (+1000)
Subject: Work around the need to include net_linked.qh from sv_model.qc (temporary hack for... 
X-Git-Tag: xonotic-v0.8.5~2674
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c58f64ef151dab8679008c4afa1737f69b948ba0;p=xonotic%2Fxonotic-data.pk3dir.git

Work around the need to include net_linked.qh from sv_model.qc (temporary hack for self containment)
---

diff --git a/qcsrc/common/net_linked.qh b/qcsrc/common/net_linked.qh
index 9cd2094a6..de8cf8f92 100644
--- a/qcsrc/common/net_linked.qh
+++ b/qcsrc/common/net_linked.qh
@@ -40,8 +40,6 @@ REGISTER_NET_LINKED(ENT_CLIENT_RANDOMSEED)
 REGISTER_NET_LINKED(ENT_CLIENT_ACCURACY)
 REGISTER_NET_LINKED(ENT_CLIENT_ELIMINATEDPLAYERS)
 
-REGISTER_NET_LINKED(ENT_CLIENT_MODEL)
-
 REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE)
 REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE_CAMERA)
 REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE_TELEPORTED)
@@ -53,3 +51,5 @@ REGISTER_NET_LINKED(ENT_CLIENT_TUBANOTE)
 REGISTER_NET_LINKED(ENT_CLIENT_SPAWNPOINT)
 REGISTER_NET_LINKED(ENT_CLIENT_SPAWNEVENT)
 REGISTER_NET_LINKED(ENT_CLIENT_WALL)
+
+#include <lib/csqcmodel/net.qh>
diff --git a/qcsrc/lib/csqcmodel/net.qh b/qcsrc/lib/csqcmodel/net.qh
new file mode 100644
index 000000000..43ad1b99f
--- /dev/null
+++ b/qcsrc/lib/csqcmodel/net.qh
@@ -0,0 +1,3 @@
+#pragma once
+
+REGISTER_NET_LINKED(ENT_CLIENT_MODEL)
diff --git a/qcsrc/lib/csqcmodel/sv_model.qc b/qcsrc/lib/csqcmodel/sv_model.qc
index ad391d5fe..0ff438994 100644
--- a/qcsrc/lib/csqcmodel/sv_model.qc
+++ b/qcsrc/lib/csqcmodel/sv_model.qc
@@ -22,7 +22,6 @@
 #include "sv_model.qh"
 
 #include "common.qh"
-#include <common/net_linked.qh>
 
 // generic CSQC model code