Weapons: remove redundancies

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

diff --git a/qcsrc/lib/stats.qh b/qcsrc/lib/stats.qh
index da796b910f5fd69745323de0b3493e7530ea5843..22aff1b63626d25348f132da602849f70656c5dc 100644 (file)
--- a/qcsrc/lib/stats.qh
+++ b/qcsrc/lib/stats.qh
@@ -26,6 +26,7 @@ typedef vector vectori;
        #define _STAT(id) g_stat_##id
        #define REGISTER_STAT_2(id, T) \
                T _STAT(id); \
+               T CAT(_STAT(id), _prev); \
                REGISTER(Stats, STAT_##id, m_id, new(stat)) \
                { \
                        make_pure(this); \
@@ -36,7 +37,9 @@ typedef vector vectori;
                } \
                [[accumulate]] void stats_get() \
                { \
-                       _STAT(id) = getstat_##T(STAT_##id.m_id); \
+                       T it = getstat_##T(STAT_##id.m_id); \
+                       if (it != CAT(_STAT(id), _prev)) \
+                               CAT(_STAT(id), _prev) = _STAT(id) = it; \
                }
        #define REGISTER_STAT_3(x, T, expr) REGISTER_STAT(x, T)
 #elif defined(SVQC)
@@ -47,16 +50,16 @@ typedef vector vectori;
        #define addstat_int(id, fld) addstat(id, AS_INT, fld)
        #define addstat_bool(id, fld) addstat(id, AS_INT, fld)
        #define addstat_float(id, fld) addstat(id, AS_FLOAT, fld)
-       #define addstat_vector(id, fld) do { \
+       #define addstat_vector(id, fld) MACRO_BEGIN { \
                addstat_float(id + 0, fld##_x); \
                addstat_float(id + 1, fld##_y); \
                addstat_float(id + 2, fld##_z); \
-       } while (0)
-       #define addstat_vectori(id, fld) do { \
+       } MACRO_END
+       #define addstat_vectori(id, fld) MACRO_BEGIN { \
                addstat_int(id + 0, fld##_x); \
                addstat_int(id + 1, fld##_y); \
                addstat_int(id + 2, fld##_z); \
-       } while (0)
+       } MACRO_END
        const int AS_STRING = 1;
        const int AS_INT = 2;
        const int AS_FLOAT = 8;