Remove redundant strcat1()

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / replicate.qh

diff --git a/qcsrc/lib/replicate.qh b/qcsrc/lib/replicate.qh
index 470d56aa039f72ce71d7d66b2ffc69fbb2dce198..c9fbd87fde1f6631bd936f28d8c9179147c098d5 100644 (file)
--- a/qcsrc/lib/replicate.qh
+++ b/qcsrc/lib/replicate.qh
@@ -1,10 +1,5 @@
 #pragma once
 
-#ifdef SVQC
-// copies a string to a tempstring (so one can strunzone it)
-string strcat1(string s) = #115; // FRIK_FILE
-#endif
-
 #if defined(CSQC)
 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
@@ -51,8 +46,11 @@ const int REPLICATEVARS_DESTROY = 1; // destroy data associated with cvars (shut
        }
        void ReplicateVars_Start()
        {
-               ReplicateVars_time = time;
-               ReplicateVars(REPLICATEVARS_SEND_ALL);
+               if (!ReplicateVars_time) // make sure it gets executed only once
+               {
+                       ReplicateVars_time = time;
+                       ReplicateVars(REPLICATEVARS_SEND_ALL);
+               }
        }
        #endif
 
@@ -65,12 +63,13 @@ const int REPLICATEVARS_DESTROY = 1; // destroy data associated with cvars (shut
                { strfree(field); }, \
                { \
                        /* also initialize to the default value of func when requesting cvars */ \
-                       string s = func(this, strcat1(field)); \
+                       string s = func(this, strcat(field)); \
                        if (s != field) \
                        { \
                                strcpy(field, s); \
                        } \
                })
+               #define REPLICATE_vector(fld, var, func) REPLICATE_7(fld, vector, var, func, { field = stov(it); },          , )
                #define REPLICATE_float(fld, var, func) REPLICATE_7(fld, float, var, func,  { field = stof(it); },          , )
                #define REPLICATE_bool(fld, var, func) REPLICATE_7(fld, bool, var, func,   { field = boolean(stoi(it)); }, , )
                #define REPLICATE_int(fld, var, func) REPLICATE_7(fld, int, var, func,    { field = stoi(it); },          , )
@@ -97,6 +96,7 @@ const int REPLICATEVARS_DESTROY = 1; // destroy data associated with cvars (shut
                                store.fld = field; \
                        }
        #elif defined(CSQC)
+               #define REPLICATE_vector(fld, var, func) REPLICATE_7(fld, vector, var, func, (fld != stov(cvar_string(var))), { fld = stov(cvar_string(var)); }, )
                #define REPLICATE_string(fld, var, func) REPLICATE_7(fld, float, var, func, (fld != cvar_string(var)), { strcpy(fld, cvar_string(var)); }, { strfree(fld); })
                #define REPLICATE_float(fld, var, func) REPLICATE_7(fld, float, var, func, (fld != cvar(var)), { fld = cvar(var); }, )
                #define REPLICATE_bool(fld, var, func) REPLICATE_7(fld, bool, var, func, (fld != cvar(var)), { fld = cvar(var); }, )