Menu: remove useless registries and related code (TempEntities, LinkedEntities, C2S_P...

diff --git a/qcsrc/common/gamemodes/gamemode/survival/survival.qc b/qcsrc/common/gamemodes/gamemode/survival/survival.qc
index a8a67ad44efe5e76395c1587fe1b13c4ea2ff201..26191ad9c893855b4954ff0da60eec1915d98dd3 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/survival/survival.qc
+++ b/qcsrc/common/gamemodes/gamemode/survival/survival.qc
@@ -1,2 +1,5 @@
 #include "survival.qh"
+
+#ifdef GAMEQC
 REGISTER_NET_LINKED(ENT_CLIENT_SURVIVALSTATUSES)
+#endif

diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qh b/qcsrc/common/mutators/mutator/buffs/buffs.qh
index ae465dfdb3a5e8bfd0049894e403bb74a718dab6..a14ad6bb8cdb4e6062cbae72c7244b527bee6177 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/buffs.qh
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh
@@ -8,11 +8,6 @@
 #include <common/mutators/mutator/waypoints/all.qh>
 #endif
 
-#ifdef GAMEQC
-REGISTER_WAYPOINT(Buff, _("Buff"), "", '1 0.5 0', 1);
-REGISTER_RADARICON(Buff, 1);
-#endif
-
 #define REGISTER_BUFF(id, inst) \
     REGISTER(StatusEffect, BUFF_##id, m_id, inst)
 

diff --git a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
index 7cdd567f1a59d7057c1c36348cf38b54fa1d72d8..0ed133530888e8791e4269bfa93c47f62265adf0 100644 (file)
--- a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
+++ b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
@@ -1,3 +1,5 @@
 #include "damagetext.qh"
 
+#ifdef GAMEQC
 REGISTER_NET_LINKED(damagetext)
+#endif

diff --git a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
index 19045727b6cc8e8a0ae603d0315713c89b148924..5aa59bffc38eb6f29f2da638dfb25a9527d54e44 100644 (file)
--- a/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
+++ b/qcsrc/common/mutators/mutator/itemstime/itemstime.qc
@@ -2,7 +2,9 @@
 
 REGISTER_MUTATOR(itemstime, true);
 
+#ifdef GAMEQC
 REGISTER_NET_TEMP(itemstime)
+#endif
 
 #ifdef SVQC
 void IT_Write(entity e, int i, float f) {

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 01f78c05b3f938d000ee1fd568391283388d815b..3f9e54cdbd97b40d9c153198c9eeccad918ab9e1 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -37,9 +37,11 @@ entity Nade_TrailEffect(int proj, int nade_team)
 
     return EFFECT_Null;
 }
-#endif
 
 REGISTER_NET_TEMP(TE_CSQC_DARKBLINKING);
+
+#endif
+
 #ifdef CSQC
 #include <client/draw.qh>
 #include <client/hud/hud.qh>

diff --git a/qcsrc/common/mutators/mutator/waypoints/all.inc b/qcsrc/common/mutators/mutator/waypoints/all.inc
index 98b1f4d3ce8b5f78bee76adc87a0e057690ef0cd..50664831af3cf073c02b9ffbb27b8272981a63e0 100644 (file)
--- a/qcsrc/common/mutators/mutator/waypoints/all.inc
+++ b/qcsrc/common/mutators/mutator/waypoints/all.inc
@@ -71,3 +71,5 @@ REGISTER_WAYPOINT(Vehicle, _("Vehicle"), "", '1 1 1', 1);
 REGISTER_WAYPOINT(VehicleIntruder, _("Intruder!"), "", '1 1 1', 1);
 
 REGISTER_WAYPOINT(Seeker, _("Tagged"), "", '0.5 1 0', 2);
+
+REGISTER_WAYPOINT(Buff, _("Buff"), "", '1 0.5 0', 1);

diff --git a/qcsrc/common/mutators/mutator/waypoints/all.qh b/qcsrc/common/mutators/mutator/waypoints/all.qh
index fa1cbd31a1548d45a15770902c71fe858ccaa805..b5f5f161d3c72c52aed841ed2082b839799c431f 100644 (file)
--- a/qcsrc/common/mutators/mutator/waypoints/all.qh
+++ b/qcsrc/common/mutators/mutator/waypoints/all.qh
@@ -58,5 +58,6 @@ REGISTER_RADARICON(TAGGED,          1);
 REGISTER_RADARICON(Item,            1);
 REGISTER_RADARICON(Vehicle,         1);
 REGISTER_RADARICON(Weapon,          1);
+REGISTER_RADARICON(Buff,            1);
 
 #include "all.inc"

diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
index f19fc059e393661839737c680b3089491e7bd4db..0625f412ee18cc37c8ffbe6edab3f735bef2402a 100644 (file)
--- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
+++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
@@ -2,7 +2,9 @@
 
 REGISTER_MUTATOR(waypointsprites, true);
 
+#ifdef GAMEQC
 REGISTER_NET_LINKED(waypointsprites)
+#endif
 
 #ifdef SVQC
 bool WaypointSprite_SendEntity(entity this, entity to, float sendflags)

diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc
index bd4e5975a21cb89cf725316b75db15f5a2208608..b41a14f3452196e6b2d12cb5a5c1d0a90f6499a9 100644 (file)
--- a/qcsrc/common/weapons/weapon/shockwave.qc
+++ b/qcsrc/common/weapons/weapon/shockwave.qc
@@ -1,6 +1,8 @@
 #include "shockwave.qh"
 
+#ifdef GAMEQC
 REGISTER_NET_TEMP(TE_CSQC_SHOCKWAVEPARTICLE)
+#endif
 
 #ifdef SVQC
 

diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc
index 4be54b6b220378c28746b2f864cc1bc730681e46..9ca0b3192d71f5394879ed6c0e64f7eb38953eb1 100644 (file)
--- a/qcsrc/common/weapons/weapon/vaporizer.qc
+++ b/qcsrc/common/weapons/weapon/vaporizer.qc
@@ -1,6 +1,8 @@
 #include "vaporizer.qh"
 
+#ifdef GAMEQC
 REGISTER_NET_TEMP(TE_CSQC_VAPORBEAMPARTICLE)
+#endif
 
 #if defined(SVQC)
 void SendCSQCVaporizerBeamParticle(entity player, int hit) {

diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc
index 4d4e43ec6cb7ea0356eb8317da2fe5833457d4e0..d9cacac00de1e5092b13d52f747fc741dadfd2dc 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@ -24,7 +24,9 @@ METHOD(Vortex, wr_glow, vector(Vortex this, int actor_colors, entity wepent))
 }
 #endif
 
+#ifdef GAMEQC
 REGISTER_NET_TEMP(TE_CSQC_VORTEXBEAMPARTICLE)
+#endif
 
 #if defined(SVQC)
 void SendCSQCVortexBeamParticle(float charge) {

diff --git a/qcsrc/lib/net.qh b/qcsrc/lib/net.qh
index c9cdf6981b8533cf6eb85f88a478c8ee4150c8ea..7c490fd157e477c70d723b3663b77116c2f6f833 100644 (file)
--- a/qcsrc/lib/net.qh
+++ b/qcsrc/lib/net.qh
@@ -7,6 +7,9 @@
 // netcode mismatch and not sure what caused it? developer_csqcentities 1
 
 .string netname;
+
+#ifdef GAMEQC
+
 .int m_id;
 .bool(entity this, entity sender, bool isNew) m_read;
 #define NET_HANDLE(id, param) bool Net_Handle_##id(entity this, entity sender, param)
@@ -37,7 +40,6 @@ string _net_prevmsgstr;
                        this.netname = #id; \
                }
 #endif
-#define REGISTER_NET_S2C(id) REGISTER_NET_TEMP(id)
 
 REGISTRY(TempEntities, BITS(8) - 80)
 REGISTER_REGISTRY(TempEntities)
@@ -107,6 +109,8 @@ REGISTRY_CHECK(C2S_Protocol)
 REGISTRY_DEFINE_GET(C2S_Protocol, NULL)
 STATIC_INIT(C2S_Protocol_renumber) { FOREACH(C2S_Protocol, true, it.m_id = i); }
 
+#endif // GAMEQC
+
 #ifdef SVQC
        const int MSG_ENTITY = 5;
 

diff --git a/qcsrc/lib/registry_net.qh b/qcsrc/lib/registry_net.qh
index 6c947d7c5db192d390eab5d9b3616e190af37f56..1c5b04342a27eb0fcadb5955b7cf237ec52f3a29 100644 (file)
--- a/qcsrc/lib/registry_net.qh
+++ b/qcsrc/lib/registry_net.qh
@@ -2,7 +2,9 @@
 
 #include "net.qh"
 
+#ifdef GAMEQC
 REGISTER_NET_TEMP(registry)
+#endif
 
 #ifdef CSQC
 NET_HANDLE(registry, bool isnew)