Merge branch 'TimePath/strfree' into 'master'

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

diff --git a/qcsrc/lib/replicate.qh b/qcsrc/lib/replicate.qh
index 4031352fedbe8c34eb264ca20c22682c4f2e1c0a..656989782672e60c948199c0b8deb94f2f10b0a6 100644 (file)
--- a/qcsrc/lib/replicate.qh
+++ b/qcsrc/lib/replicate.qh
@@ -19,14 +19,13 @@
        #define REPLICATE_string(fld, var, func) \
                REPLICATE_7(fld, string, var, , \
        { strcpy(field, it); }, \
-       { if (field) strunzone(field); field = string_null; }, \
+       { strfree(field); }, \
        { \
                /* also initialize to the default value of func when requesting cvars */ \
                string s = func(field); \
                if (s != field) \
                { \
-                   strunzone(field); \
-                   field = strzone(s); \
+                   strcpy(field, s); \
                } \
        })
        #define REPLICATE_float(fld, var, func) REPLICATE_7(fld, float, var, func,  { field = stof(it); },          , )