Net: move message headers to their respective files

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 2b40b2e00355586f299355878d6ce8b5bfbc9f3e..8c94c37ca94da55b17fbf6b4d8f445a2fc92d5d2 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -33,14 +33,10 @@ const int AS_FLOAT = 8;
 
 REGISTER_NET_TEMP(TE_CSQC_PICTURE)
 REGISTER_NET_TEMP(TE_CSQC_RACE)
-REGISTER_NET_TEMP(TE_CSQC_VORTEXBEAMPARTICLE)
 REGISTER_NET_TEMP(TE_CSQC_TEAMNAGGER)
 REGISTER_NET_TEMP(TE_CSQC_PINGPLREPORT)
-REGISTER_NET_TEMP(TE_CSQC_TARGET_MUSIC)
 REGISTER_NET_TEMP(TE_CSQC_WEAPONCOMPLAIN)
 REGISTER_NET_TEMP(TE_CSQC_VEHICLESETUP)
-REGISTER_NET_TEMP(TE_CSQC_SVNOTICE)
-REGISTER_NET_TEMP(TE_CSQC_SHOCKWAVEPARTICLE)
 
 const int RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
 const int RACE_NET_CHECKPOINT_CLEAR = 1;
@@ -61,9 +57,6 @@ REGISTER_NET_LINKED(ENT_CLIENT_ENTCS)
 REGISTER_NET_LINKED(ENT_CLIENT_SCORES_INFO)
 REGISTER_NET_LINKED(ENT_CLIENT_SCORES)
 REGISTER_NET_LINKED(ENT_CLIENT_TEAMSCORES)
-REGISTER_NET_LINKED(ENT_CLIENT_POINTPARTICLES)
-REGISTER_NET_LINKED(ENT_CLIENT_RAINSNOW)
-REGISTER_NET_LINKED(ENT_CLIENT_LASER)
 REGISTER_NET_LINKED(ENT_CLIENT_NAGGER) // flags [votecalledvote]
 REGISTER_NET_LINKED(ENT_CLIENT_RADARLINK) // flags [startorigin] [endorigin] [startcolor+16*endcolor]
 REGISTER_NET_LINKED(ENT_CLIENT_PROJECTILE)
@@ -71,39 +64,22 @@ REGISTER_NET_LINKED(ENT_CLIENT_INIT)
 REGISTER_NET_LINKED(ENT_CLIENT_MAPVOTE)
 REGISTER_NET_LINKED(ENT_CLIENT_CLIENTDATA)
 REGISTER_NET_LINKED(ENT_CLIENT_RANDOMSEED)
-REGISTER_NET_LINKED(ENT_CLIENT_WALL)
-REGISTER_NET_LINKED(ENT_CLIENT_TUBANOTE)
+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_TRIGGER_MUSIC)
-REGISTER_NET_LINKED(ENT_CLIENT_HOOK)
-REGISTER_NET_LINKED(ENT_CLIENT_INVENTORY)
-REGISTER_NET_LINKED(ENT_CLIENT_ARC_BEAM) // WEAPONTODO: fix numbers
-REGISTER_NET_LINKED(ENT_CLIENT_ACCURACY)
 REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE_TELEPORTED)
-REGISTER_NET_LINKED(ENT_CLIENT_MODEL)
-REGISTER_NET_LINKED(ENT_CLIENT_ITEM)
-REGISTER_NET_LINKED(ENT_CLIENT_BUMBLE_RAYGUN)
+
+REGISTER_NET_LINKED(ENT_CLIENT_ARC_BEAM)
+REGISTER_NET_LINKED(ENT_CLIENT_HOOK)
+REGISTER_NET_LINKED(ENT_CLIENT_TUBANOTE)
+
 REGISTER_NET_LINKED(ENT_CLIENT_SPAWNPOINT)
 REGISTER_NET_LINKED(ENT_CLIENT_SPAWNEVENT)
-REGISTER_NET_LINKED(ENT_CLIENT_NOTIFICATION)
-REGISTER_NET_LINKED(ENT_CLIENT_ELIMINATEDPLAYERS)
-REGISTER_NET_LINKED(ENT_CLIENT_TURRET)
-REGISTER_NET_LINKED(ENT_CLIENT_AUXILIARYXHAIR)
-REGISTER_NET_LINKED(ENT_CLIENT_LADDER)
-REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_PUSH)
-REGISTER_NET_LINKED(ENT_CLIENT_TARGET_PUSH)
-REGISTER_NET_LINKED(ENT_CLIENT_CONVEYOR)
-REGISTER_NET_LINKED(ENT_CLIENT_DOOR)
-REGISTER_NET_LINKED(ENT_CLIENT_TRAIN)
-REGISTER_NET_LINKED(ENT_CLIENT_PLAT)
-REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_IMPULSE)
-REGISTER_NET_LINKED(ENT_CLIENT_SWAMP)
-REGISTER_NET_LINKED(ENT_CLIENT_CORNER)
-REGISTER_NET_LINKED(ENT_CLIENT_KEYLOCK)
-REGISTER_NET_LINKED(ENT_CLIENT_MINIGAME)
-REGISTER_NET_LINKED(ENT_CLIENT_VIEWLOC)
-REGISTER_NET_LINKED(ENT_CLIENT_VIEWLOC_TRIGGER)
+REGISTER_NET_LINKED(ENT_CLIENT_WALL)
 
 const int SPRITERULE_DEFAULT = 0;
 const int SPRITERULE_TEAMPLAY = 1;

diff --git a/qcsrc/common/items/inventory.qh b/qcsrc/common/items/inventory.qh
index b4c7c787c431e47ebb7c80bfd238b7ed0f945f03..4ea37899432ac1aace4ac4e42a3bd240d12178a0 100644 (file)
--- a/qcsrc/common/items/inventory.qh
+++ b/qcsrc/common/items/inventory.qh
@@ -11,6 +11,8 @@ class(Inventory) .int inv_items[Items_MAX];
 /** Player inventory; Inventories also have one inventory for storing the previous state */
 .Inventory inventory;
 
+REGISTER_NET_LINKED(ENT_CLIENT_INVENTORY)
+
 #ifdef CSQC
 NET_HANDLE(ENT_CLIENT_INVENTORY, bool isnew)
 {

diff --git a/qcsrc/common/minigames/minigames.qc b/qcsrc/common/minigames/minigames.qc
index bc854952e7f9562dea72efdd50d91b15d81bc7b1..8a29bc297f89246abefdbe0773c6f0f42af7ba10 100644 (file)
--- a/qcsrc/common/minigames/minigames.qc
+++ b/qcsrc/common/minigames/minigames.qc
@@ -1,5 +1,7 @@
 #include "minigames.qh"
 
+REGISTER_NET_LINKED(ENT_CLIENT_MINIGAME)
+
 entity minigame_get_descriptor(string id)
 {
        FOREACH(Minigames, true, LAMBDA(

diff --git a/qcsrc/common/net_notice.qc b/qcsrc/common/net_notice.qc
index b409ecd5ff3ffb110e1b875622b6e38d37a655cb..b54e19e98312b5ef91fb7e98293cb458a7ce86c3 100644 (file)
--- a/qcsrc/common/net_notice.qc
+++ b/qcsrc/common/net_notice.qc
@@ -1,5 +1,7 @@
 #include "net_notice.qh"
 
+REGISTER_NET_TEMP(TE_CSQC_SVNOTICE)
+
 #ifdef SVQC
 void sv_notice_join_think()
 {SELFPARAM();

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 6507669b61ad7b626aafb1f07d0415a7ecb55f00..94a46d94aed1774daf01790a11414ca9509b329e 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -1679,6 +1679,8 @@ void Local_Notification_WOVA(
 //  Notification Networking
 // =========================
 
+REGISTER_NET_LINKED(ENT_CLIENT_NOTIFICATION)
+
 #ifdef CSQC
 NET_HANDLE(ENT_CLIENT_NOTIFICATION, bool is_new)
 {

diff --git a/qcsrc/common/triggers/func/conveyor.qc b/qcsrc/common/triggers/func/conveyor.qc
index f0cc4d8037258955fd5bd86ba1af63077f4adfeb..ac30dda43deb43f5dcb1197e7adbed9fe498f1ea 100644 (file)
--- a/qcsrc/common/triggers/func/conveyor.qc
+++ b/qcsrc/common/triggers/func/conveyor.qc
@@ -1,3 +1,5 @@
+REGISTER_NET_LINKED(ENT_CLIENT_CONVEYOR)
+
 void conveyor_think()
 {SELFPARAM();
 #ifdef CSQC

diff --git a/qcsrc/common/triggers/func/door.qc b/qcsrc/common/triggers/func/door.qc
index 20bedff30cfc983e1b6844fb81e754b2875cb416..6c825655664e18722470be94299c031897da2de2 100644 (file)
--- a/qcsrc/common/triggers/func/door.qc
+++ b/qcsrc/common/triggers/func/door.qc
@@ -599,6 +599,8 @@ void LinkDoors()
        door_spawnfield(cmins, cmaxs);
 }
 
+REGISTER_NET_LINKED(ENT_CLIENT_DOOR)
+
 #ifdef SVQC
 /*QUAKED spawnfunc_func_door (0 .5 .8) ? START_OPEN x DOOR_DONT_LINK GOLD_KEY SILVER_KEY TOGGLE
 if two doors touch, they are assumed to be connected and operate as a unit.

diff --git a/qcsrc/common/triggers/func/ladder.qc b/qcsrc/common/triggers/func/ladder.qc
index 8c87c15ae5f276a3189f1578996420000f424617..0ddf08eef07cb0585143f276a06c8b5fb139ce0f 100644 (file)
--- a/qcsrc/common/triggers/func/ladder.qc
+++ b/qcsrc/common/triggers/func/ladder.qc
@@ -1,3 +1,5 @@
+REGISTER_NET_LINKED(ENT_CLIENT_LADDER)
+
 void func_ladder_touch()
 {SELFPARAM();
 #ifdef SVQC

diff --git a/qcsrc/common/triggers/func/plat.qc b/qcsrc/common/triggers/func/plat.qc
index 3b3c8eefddf41b8c5127dcaa483ec443bca8c2e8..cb2cc3a49cbeb47c065c05bbd071323657e15581 100644 (file)
--- a/qcsrc/common/triggers/func/plat.qc
+++ b/qcsrc/common/triggers/func/plat.qc
@@ -1,3 +1,5 @@
+REGISTER_NET_LINKED(ENT_CLIENT_PLAT)
+
 #ifdef SVQC
 void plat_link();
 

diff --git a/qcsrc/common/triggers/func/pointparticles.qc b/qcsrc/common/triggers/func/pointparticles.qc
index 470e5ff5ba2f4a84245e8e6926087b951a5af3c3..ef42c93eb06514c8547a9cca55b916a41d35f2a8 100644 (file)
--- a/qcsrc/common/triggers/func/pointparticles.qc
+++ b/qcsrc/common/triggers/func/pointparticles.qc
@@ -1,3 +1,5 @@
+REGISTER_NET_LINKED(ENT_CLIENT_POINTPARTICLES)
+
 #ifdef SVQC
 // NOTE: also contains func_sparks
 

diff --git a/qcsrc/common/triggers/func/rainsnow.qc b/qcsrc/common/triggers/func/rainsnow.qc
index f1f320ee6bbd2e3ed449a7dd70b01f88b977405f..7ed9c558c33b55d2914c3bca4ca638ec1f9370d3 100644 (file)
--- a/qcsrc/common/triggers/func/rainsnow.qc
+++ b/qcsrc/common/triggers/func/rainsnow.qc
@@ -1,3 +1,5 @@
+REGISTER_NET_LINKED(ENT_CLIENT_RAINSNOW)
+
 #ifdef SVQC
 bool rainsnow_SendEntity(entity this, entity to, float sf)
 {

diff --git a/qcsrc/common/triggers/func/train.qc b/qcsrc/common/triggers/func/train.qc
index d7a3666ffe21e30cd16b787925aaac131e9e63d6..0f827a60e37e4bdef4c8c031a84c5b927f9c11f7 100644 (file)
--- a/qcsrc/common/triggers/func/train.qc
+++ b/qcsrc/common/triggers/func/train.qc
@@ -101,6 +101,8 @@ void train_next()
                _sound(self, CH_TRIGGER_SINGLE, self.noise, VOL_BASE, ATTEN_IDLE);
 }
 
+REGISTER_NET_LINKED(ENT_CLIENT_TRAIN)
+
 #ifdef SVQC
 float train_send(entity to, float sf)
 {SELFPARAM();

diff --git a/qcsrc/common/triggers/misc/corner.qc b/qcsrc/common/triggers/misc/corner.qc
index 1623ac4fc402a4a51cb96ab93c45477969664a84..d1bfe00de3c0c2ba41245f90ee1e0b4809023247 100644 (file)
--- a/qcsrc/common/triggers/misc/corner.qc
+++ b/qcsrc/common/triggers/misc/corner.qc
@@ -1,3 +1,5 @@
+REGISTER_NET_LINKED(ENT_CLIENT_CORNER)
+
 #ifdef SVQC
 bool corner_send(entity to, int sf)
 {SELFPARAM();

diff --git a/qcsrc/common/triggers/misc/laser.qc b/qcsrc/common/triggers/misc/laser.qc
index 20a5b7229fdf9e73afc05dd4682e3e6f3c625d71..a7dcd7e902d6fe48032630cfcc93d32768c3fa58 100644 (file)
--- a/qcsrc/common/triggers/misc/laser.qc
+++ b/qcsrc/common/triggers/misc/laser.qc
@@ -7,6 +7,8 @@
 #elif defined(SVQC)
 #endif
 
+REGISTER_NET_LINKED(ENT_CLIENT_LASER)
+
 #ifdef SVQC
 .float modelscale;
 void misc_laser_aim()

diff --git a/qcsrc/common/triggers/target/music.qc b/qcsrc/common/triggers/target/music.qc
index a1ef4829d46c373665306be2c3e3b3fd4e007ff3..283b8afb47767a1d8be8029e52c827493eb930e0 100644 (file)
--- a/qcsrc/common/triggers/target/music.qc
+++ b/qcsrc/common/triggers/target/music.qc
@@ -6,6 +6,9 @@
     #include "../../../server/defs.qh"
 #endif
 
+REGISTER_NET_TEMP(TE_CSQC_TARGET_MUSIC)
+REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_MUSIC)
+
 #ifdef SVQC
 
 // values:

diff --git a/qcsrc/common/triggers/trigger/impulse.qc b/qcsrc/common/triggers/trigger/impulse.qc
index a9c68051bd15f8bb3d8de8f6cf357233a9483d66..77c491c356b58647ad0c34c2d467b2e138d92c4b 100644 (file)
--- a/qcsrc/common/triggers/trigger/impulse.qc
+++ b/qcsrc/common/triggers/trigger/impulse.qc
@@ -113,6 +113,8 @@ void trigger_impulse_touch3()
 #endif
 }
 
+REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_IMPULSE)
+
 /*QUAKED spawnfunc_trigger_impulse (.5 .5 .5) ?
 -------- KEYS --------
 target : If this is set, this points to the spawnfunc_target_position to which the player will get pushed.

diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc
index 7cbc86e963812ad4de1a50d9e8ecbf0e50f84f74..0b3be0056de03bb8dafd15683d77eb73b919d38d 100644 (file)
--- a/qcsrc/common/triggers/trigger/jumppads.qc
+++ b/qcsrc/common/triggers/trigger/jumppads.qc
@@ -13,6 +13,9 @@ void trigger_push_use()
 }
 #endif
 
+REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_PUSH)
+REGISTER_NET_LINKED(ENT_CLIENT_TARGET_PUSH)
+
 /*
        trigger_push_calculatevelocity
 

diff --git a/qcsrc/common/triggers/trigger/keylock.qc b/qcsrc/common/triggers/trigger/keylock.qc
index d3ffd719d9f8a14acb1e69de2b1dd34f3ee24401..98b121d6eebc9eca44930c10f61ea0f442775b1a 100644 (file)
--- a/qcsrc/common/triggers/trigger/keylock.qc
+++ b/qcsrc/common/triggers/trigger/keylock.qc
@@ -94,6 +94,8 @@ void trigger_keylock_touch()
 
 }
 
+REGISTER_NET_LINKED(ENT_CLIENT_KEYLOCK)
+
 #ifdef SVQC
 bool trigger_keylock_send(entity to, int sf)
 {SELFPARAM();

diff --git a/qcsrc/common/triggers/trigger/swamp.qc b/qcsrc/common/triggers/trigger/swamp.qc
index 38e4e394a2604c3d5c61c001b76646ec754bf135..ae29a75342fa4fee0a6446a85cf41a5d48ca7e75 100644 (file)
--- a/qcsrc/common/triggers/trigger/swamp.qc
+++ b/qcsrc/common/triggers/trigger/swamp.qc
@@ -92,10 +92,12 @@ void swamp_touch()
        other.swampslug.health = 2;
 }
 
+REGISTER_NET_LINKED(ENT_CLIENT_SWAMP)
+
 #ifdef SVQC
 float swamp_send(entity to, float sf)
 {SELFPARAM();
-       WriteHeader(MSG_ENTITY, ENT_CLIENT_LADDER); // FIXME: should this really be sent as a ladder?
+       WriteHeader(MSG_ENTITY, ENT_CLIENT_SWAMP);
 
        WriteByte(MSG_ENTITY, self.dmg); // can probably get away with using a single byte here
        WriteByte(MSG_ENTITY, self.swamp_slowdown);

diff --git a/qcsrc/common/triggers/trigger/viewloc.qc b/qcsrc/common/triggers/trigger/viewloc.qc
index 81b364cefacbecb2bd3f825aeb11f02abde29f37..af67533a831fe4622afc39a7b519b369a92917cb 100644 (file)
--- a/qcsrc/common/triggers/trigger/viewloc.qc
+++ b/qcsrc/common/triggers/trigger/viewloc.qc
@@ -5,6 +5,9 @@
     #include "../../../server/defs.qh"
 #endif
 
+REGISTER_NET_LINKED(ENT_CLIENT_VIEWLOC)
+REGISTER_NET_LINKED(ENT_CLIENT_VIEWLOC_TRIGGER)
+
 #ifdef SVQC
 
 void viewloc_think()

diff --git a/qcsrc/common/turrets/all.qc b/qcsrc/common/turrets/all.qc
index 8fa4632f9e941f775bdf2188b48e9fa24cfaa26f..bbd0d6811ab42401fd4d33e2d684f3fc75b8a30d 100644 (file)
--- a/qcsrc/common/turrets/all.qc
+++ b/qcsrc/common/turrets/all.qc
@@ -1,5 +1,7 @@
 #include "all.qh"
 
+REGISTER_NET_LINKED(ENT_CLIENT_TURRET)
+
 #ifdef SVQC
 #include "sv_turrets.qh"
 #endif

diff --git a/qcsrc/common/vehicles/all.qc b/qcsrc/common/vehicles/all.qc
index 72d72d29d19d14a1cd7de16ce51a8399c1347d74..c7b84582239e1c129ab4de4d95d2e79fb6a82f66 100644 (file)
--- a/qcsrc/common/vehicles/all.qc
+++ b/qcsrc/common/vehicles/all.qc
@@ -23,6 +23,8 @@ STATIC_INIT(vehicles_common_initialize)
 }
 #endif
 
+REGISTER_NET_LINKED(ENT_CLIENT_AUXILIARYXHAIR)
+
 #if defined(SVQC)
        #include "sv_vehicles.qc"
 #elif defined(CSQC)

diff --git a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
index a5bb23e639bb7adce88a2a575b634e13ed77181d..8ff604579c246715959e4164c7290bab31bd79bd 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
+++ b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
@@ -7,6 +7,8 @@
 
 #ifdef IMPLEMENTATION
 
+REGISTER_NET_LINKED(ENT_CLIENT_BUMBLE_RAYGUN)
+
 #ifdef SVQC
 
 float autocvar_g_vehicle_bumblebee_cannon_cost;

diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc
index e2f56c94977327866bf15a08396a4807c42389c2..b795cb7e9f393559e6d2d02a9226bafecebc4c18 100644 (file)
--- a/qcsrc/common/weapons/weapon/shockwave.qc
+++ b/qcsrc/common/weapons/weapon/shockwave.qc
@@ -83,6 +83,9 @@ void Net_ReadShockwaveParticle();
 #endif
 #endif
 #ifdef IMPLEMENTATION
+
+REGISTER_NET_TEMP(TE_CSQC_SHOCKWAVEPARTICLE)
+
 #ifdef SVQC
 spawnfunc(weapon_shockwave)
 {

diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc
index b5e81c8e6d9678d802c6658d2534ceb2976b4a15..bae7cca3de0ccb6fbd30086152c9c0f3cb31bedc 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@ -61,6 +61,8 @@ VORTEX_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
 #endif
 #ifdef IMPLEMENTATION
 
+REGISTER_NET_TEMP(TE_CSQC_VORTEXBEAMPARTICLE)
+
 #if defined(SVQC)
 void SendCSQCVortexBeamParticle(float charge) {
        vector v;

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 5d2509102925a2f0d54eb1a93d0bdb5baf3b1d76..f295777db791f581cc15e5a10ecdd4eb79cdea3b 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -26,6 +26,8 @@
     #include "../lib/warpzone/util_server.qh"
 #endif
 
+REGISTER_NET_LINKED(ENT_CLIENT_ITEM)
+
 #ifdef CSQC
 void ItemDraw(entity self)
 {