REPLICATE_FIELD -> REPLICATE_INIT

diff --git a/qcsrc/common/effects/qc/casings.qh b/qcsrc/common/effects/qc/casings.qh
index f43e15a1cd6192790c2b7bf038473686f621e5b3..f4884cb233d5424bbede9027db792c7137025185 100644 (file)
--- a/qcsrc/common/effects/qc/casings.qh
+++ b/qcsrc/common/effects/qc/casings.qh
@@ -9,8 +9,8 @@ float autocvar_cl_casings_ticrate = 0.1;
 #endif
 
 #ifdef GAMEQC
-REPLICATE_FIELD(bool, cvar_cl_casings);
-REPLICATE_FIELD(int, cvar_r_drawviewmodel);
+REPLICATE_INIT(bool, cvar_cl_casings);
+REPLICATE_INIT(int, cvar_r_drawviewmodel);
 #endif
 
 #ifdef SVQC

diff --git a/qcsrc/common/effects/qc/globalsound.qh b/qcsrc/common/effects/qc/globalsound.qh
index d9a7eac301c15db9afa102a13ee86027f4e602cb..e244961620a0006a4dfd1835fc30a9597ef0a8ab 100644 (file)
--- a/qcsrc/common/effects/qc/globalsound.qh
+++ b/qcsrc/common/effects/qc/globalsound.qh
@@ -16,9 +16,9 @@
 .string m_playersoundstr;
 ..string m_playersoundfld;
 
-REPLICATE_FIELD(float, cvar_cl_autotaunt);
-REPLICATE_FIELD(int, cvar_cl_voice_directional);
-REPLICATE_FIELD(float, cvar_cl_voice_directional_taunt_attenuation);
+REPLICATE_INIT(float, cvar_cl_autotaunt);
+REPLICATE_INIT(int, cvar_cl_voice_directional);
+REPLICATE_INIT(float, cvar_cl_voice_directional_taunt_attenuation);
 
 REGISTRY(PlayerSounds, BITS(8) - 1)
 #define REGISTER_PLAYERSOUND(id) \

diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qh b/qcsrc/common/mutators/mutator/buffs/buffs.qh
index b5cd426bec7a2da58c0633513e363485473e8d04..163176d5b5fa33f71cf4be53ff52aa72bbed1e5b 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/buffs.qh
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh
@@ -74,5 +74,5 @@ BUFF_SPAWNFUNCS(random, NULL)
 #include "all.inc"
 
 #ifdef GAMEQC
-REPLICATE_FIELD(bool, cvar_cl_buffs_autoreplace);
+REPLICATE_INIT(bool, cvar_cl_buffs_autoreplace);
 #endif

diff --git a/qcsrc/common/mutators/mutator/dodging/cl_dodging.qh b/qcsrc/common/mutators/mutator/dodging/cl_dodging.qh
index d7c5a52627ea3ce3ddd705fedce25aa7eecd8b4f..319a1d237f893502d08902e903e23a5d7bfbf3a0 100644 (file)
--- a/qcsrc/common/mutators/mutator/dodging/cl_dodging.qh
+++ b/qcsrc/common/mutators/mutator/dodging/cl_dodging.qh
@@ -1,4 +1,4 @@
 #pragma once
 
-REPLICATE_FIELD(float, cvar_cl_dodging_timeout);
-REPLICATE_FIELD(bool, cvar_cl_dodging);
+REPLICATE_INIT(float, cvar_cl_dodging_timeout);
+REPLICATE_INIT(bool, cvar_cl_dodging);

diff --git a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qh b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qh
index e04c2ffbc21af18abff6edda5d32a15c13ded4d3..45dc67b57bc1581ee6bff5f5dbc7356540f2a3ea 100644 (file)
--- a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qh
+++ b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qh
@@ -1,4 +1,4 @@
 #pragma once
 
-REPLICATE_FIELD(bool, cvar_cl_dodging);
-REPLICATE_FIELD(float, cvar_cl_dodging_timeout);
+REPLICATE_INIT(bool, cvar_cl_dodging);
+REPLICATE_INIT(float, cvar_cl_dodging_timeout);

diff --git a/qcsrc/common/mutators/mutator/multijump/multijump.qh b/qcsrc/common/mutators/mutator/multijump/multijump.qh
index 8073b558300bd24e5b52a899eb6f3ad248bf87d4..85cdfb5a5288f0e2633373c87d42b593fee4cc1b 100644 (file)
--- a/qcsrc/common/mutators/mutator/multijump/multijump.qh
+++ b/qcsrc/common/mutators/mutator/multijump/multijump.qh
@@ -1,5 +1,5 @@
 #pragma once
 
 #ifdef GAMEQC
-REPLICATE_FIELD(int, cvar_cl_multijump);
+REPLICATE_INIT(int, cvar_cl_multijump);
 #endif

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qh b/qcsrc/common/mutators/mutator/nades/nades.qh
index 957824a774862b9e7b8b6e8c3dccef965bdd3574..460c21571683069d92f897404d3f3d7d8335e65c 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qh
+++ b/qcsrc/common/mutators/mutator/nades/nades.qh
@@ -130,8 +130,8 @@ Nade Nade_FromProjectile(int proj)
 .float orb_radius;
 
 #ifdef GAMEQC
-REPLICATE_FIELD(int, cvar_cl_nade_type);
-REPLICATE_FIELD(string, cvar_cl_pokenade_type);
+REPLICATE_INIT(int, cvar_cl_nade_type);
+REPLICATE_INIT(string, cvar_cl_pokenade_type);
 #endif
 
 #ifdef SVQC

diff --git a/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh
index 881df9ed2f9df6666116edcb1372b4ec97e16dcf..be3a7363713f7205685bbfe171ccd0f82d93d5cb 100644 (file)
--- a/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh
+++ b/qcsrc/common/mutators/mutator/spawn_near_teammate/spawn_near_teammate.qh
@@ -1,5 +1,5 @@
 #pragma once
 
 #ifdef GAMEQC
-REPLICATE_FIELD(bool, cvar_cl_spawn_near_teammate);
+REPLICATE_INIT(bool, cvar_cl_spawn_near_teammate);
 #endif

diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh
index 034393f29cb717204dd455b6d48f750339911785..0a5b049f57c3852970861c96cc0732bea9025b33 100644 (file)
--- a/qcsrc/common/physics/player.qh
+++ b/qcsrc/common/physics/player.qh
@@ -72,9 +72,9 @@ float AdjustAirAccelQW(float accelqw, float factor);
 bool IsFlying(entity a);
 
 #ifdef GAMEQC
-REPLICATE_FIELD(string, cvar_cl_physics);
-REPLICATE_FIELD(bool, cvar_cl_jetpack_jump);
-REPLICATE_FIELD(bool, cvar_cl_movement_track_canjump);
+REPLICATE_INIT(string, cvar_cl_physics);
+REPLICATE_INIT(bool, cvar_cl_jetpack_jump);
+REPLICATE_INIT(bool, cvar_cl_movement_track_canjump);
 #endif
 
 #define PHYS_PL_MAX(s)                                         STAT(PL_MAX, s)

diff --git a/qcsrc/common/playerstats.qh b/qcsrc/common/playerstats.qh
index 4383ee3eb4a8253a8e05401bc13edda590b8f091..d5664d9d6a50d71c7216ebbdaf606ca74b8fc326 100644 (file)
--- a/qcsrc/common/playerstats.qh
+++ b/qcsrc/common/playerstats.qh
@@ -122,8 +122,8 @@ void PlayerStats_PlayerDetail_Handler(entity fh, entity p, float status);
 
 #ifdef GAMEQC
 
-REPLICATE_FIELD(int, cvar_cl_allow_uid2name);
-REPLICATE_FIELD(bool, cvar_cl_allow_uidranking);
-REPLICATE_FIELD(int, cvar_cl_allow_uidtracking);
+REPLICATE_INIT(int, cvar_cl_allow_uid2name);
+REPLICATE_INIT(bool, cvar_cl_allow_uidranking);
+REPLICATE_INIT(int, cvar_cl_allow_uidtracking);
 
 #endif

diff --git a/qcsrc/common/replicate.qh b/qcsrc/common/replicate.qh
index 65ceecf1f4d59428ad8438bfe9eba3fb95a8076c..6115223b486b3e61382fc9fb2f1a709e4d7448d4 100644 (file)
--- a/qcsrc/common/replicate.qh
+++ b/qcsrc/common/replicate.qh
@@ -1,13 +1,13 @@
 #pragma once
 
 #ifdef GAMEQC
-REPLICATE_FIELD(bool, cvar_cl_autoswitch);
-REPLICATE_FIELD(int, cvar_cl_autoscreenshot);
-REPLICATE_FIELD(bool, cvar_cl_clippedspectating);
-REPLICATE_FIELD(bool, cvar_cl_cts_noautoswitch);
-REPLICATE_FIELD(float, cvar_cl_handicap);
-REPLICATE_FIELD(bool, cvar_cl_noantilag);
-REPLICATE_FIELD(string, cvar_g_xonoticversion);
+REPLICATE_INIT(bool, cvar_cl_autoswitch);
+REPLICATE_INIT(int, cvar_cl_autoscreenshot);
+REPLICATE_INIT(bool, cvar_cl_clippedspectating);
+REPLICATE_INIT(bool, cvar_cl_cts_noautoswitch);
+REPLICATE_INIT(float, cvar_cl_handicap);
+REPLICATE_INIT(bool, cvar_cl_noantilag);
+REPLICATE_INIT(string, cvar_g_xonoticversion);
 REPLICATE(cvar_cl_autoswitch, bool, "cl_autoswitch");
 REPLICATE(cvar_cl_autoscreenshot, int, "cl_autoscreenshot");
 REPLICATE(cvar_cl_clippedspectating, bool, "cl_clippedspectating");

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 08d185e31da59468b3566fbcb08447c78f6688bd..6824680436fe3c5f320649053c2e697aa84d8ff6 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -394,17 +394,17 @@ ENUMCLASS_END(WFRAME)
 vector shotorg_adjust_values(vector vecs, bool y_is_right, bool visual, int algn);
 void CL_WeaponEntity_SetModel(entity this, string name, bool _anim);
 
-REPLICATE_FIELD(int, cvar_cl_gunalign);
-REPLICATE_FIELD(bool, cvar_cl_weapon_switch_reload);
-REPLICATE_FIELD(bool, cvar_cl_weapon_switch_fallback_to_impulse);
-REPLICATE_FIELD(int, cvar_cl_weaponimpulsemode);
+REPLICATE_INIT(int, cvar_cl_gunalign);
+REPLICATE_INIT(bool, cvar_cl_weapon_switch_reload);
+REPLICATE_INIT(bool, cvar_cl_weapon_switch_fallback_to_impulse);
+REPLICATE_INIT(int, cvar_cl_weaponimpulsemode);
 
-REPLICATE_FIELD(string, cvar_cl_weaponpriority);
-REPLICATE_FIELD(string, cvar_cl_weaponpriorities[10]);
+REPLICATE_INIT(string, cvar_cl_weaponpriority);
+REPLICATE_INIT(string, cvar_cl_weaponpriorities[10]);
 
 #ifdef CSQC
-REPLICATE_FIELD(bool, cvar_cl_accuracy_data_share);
-REPLICATE_FIELD(bool, cvar_cl_accuracy_data_receive);
+REPLICATE_INIT(bool, cvar_cl_accuracy_data_share);
+REPLICATE_INIT(bool, cvar_cl_accuracy_data_receive);
 #endif
 
 #ifdef SVQC

diff --git a/qcsrc/lib/replicate.qh b/qcsrc/lib/replicate.qh
index 2083b4166fe122e9fb9aae39b396169775ac437c..a7a8d10df7fa4e06be5021bff35384a2330929a6 100644 (file)
--- a/qcsrc/lib/replicate.qh
+++ b/qcsrc/lib/replicate.qh
@@ -9,9 +9,9 @@ string strcat1(string s) = #115; // FRIK_FILE
 const int REPLICATEVARS_SEND_ALL = -1; // sync all cvars with the server (init)
 const int REPLICATEVARS_CHECK = 0; // check if any cvar has changed and sync it with the server
 const int REPLICATEVARS_DESTROY = 1; // destroy data associated with cvars (shutdown)
-#define REPLICATE_FIELD(type, name) type name
+#define REPLICATE_INIT(type, name) type name
 #elif defined(SVQC)
-#define REPLICATE_FIELD(type, name) .type name
+#define REPLICATE_INIT(type, name) .type name
 #endif
 
 #ifdef GAMEQC

diff --git a/qcsrc/server/weapons/accuracy.qh b/qcsrc/server/weapons/accuracy.qh
index a7fb3e11ee3c8d12c39fc19ea835bfb6323dc4b3..d5d9f97d9fc469783ae5ff49bb799e02ff2f2941 100644 (file)
--- a/qcsrc/server/weapons/accuracy.qh
+++ b/qcsrc/server/weapons/accuracy.qh
@@ -20,8 +20,8 @@
 
 float autocvar_sv_accuracy_data_share = 1;
 
-REPLICATE_FIELD(bool, cvar_cl_accuracy_data_share);
-REPLICATE_FIELD(bool, cvar_cl_accuracy_data_receive);
+REPLICATE_INIT(bool, cvar_cl_accuracy_data_share);
+REPLICATE_INIT(bool, cvar_cl_accuracy_data_receive);
 
 .entity accuracy;
 .float accuracy_frags[REGISTRY_MAX(Weapons)];