Merge branch 'master' into Mario/hagar_notfixed

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

diff --git a/qcsrc/lib/stats.qh b/qcsrc/lib/stats.qh
index 22aff1b63626d25348f132da602849f70656c5dc..228e604a281444e3cd16e6fb0f032e5c94272c5d 100644 (file)
--- a/qcsrc/lib/stats.qh
+++ b/qcsrc/lib/stats.qh
@@ -1,5 +1,4 @@
-#ifndef LIB_STATS_H
-#define LIB_STATS_H
+#pragma once
 
 // TODO: rename to 'netvars'
 
@@ -7,13 +6,15 @@
 #include "sort.qh"
 
 .int m_id;
-typedef vector vectori;
+USING(vectori, vector);
 
-#define REGISTER_STAT(...) EVAL(OVERLOAD(REGISTER_STAT, __VA_ARGS__))
+#define REGISTER_STAT(...) EVAL_REGISTER_STAT(OVERLOAD(REGISTER_STAT, __VA_ARGS__))
+#define EVAL_REGISTER_STAT(...) __VA_ARGS__
 #if defined(CSQC)
        /** Get all stats and store them as globals, access with `STAT(ID)` */
        void stats_get() {}
-       #define STAT(...) EVAL(OVERLOAD(STAT, __VA_ARGS__))
+       #define STAT(...) EVAL_STAT(OVERLOAD(STAT, __VA_ARGS__))
+       #define EVAL_STAT(...) __VA_ARGS__
     #define STAT_1(id) STAT_2(id, NULL)
        #define STAT_2(id, cl) (0, _STAT(id))
 
@@ -27,9 +28,8 @@ typedef vector vectori;
        #define REGISTER_STAT_2(id, T) \
                T _STAT(id); \
                T CAT(_STAT(id), _prev); \
-               REGISTER(Stats, STAT_##id, m_id, new(stat)) \
+               REGISTER(Stats, STAT_##id, m_id, new_pure(stat)) \
                { \
-                       make_pure(this); \
                        if (#T == "vector" || #T == "vectori") { \
                                REGISTRY_RESERVE(Stats, m_id, STAT_##id, y); \
                                REGISTRY_RESERVE(Stats, m_id, STAT_##id, z); \
@@ -41,11 +41,11 @@ typedef vector vectori;
                        if (it != CAT(_STAT(id), _prev)) \
                                CAT(_STAT(id), _prev) = _STAT(id) = it; \
                }
-       #define REGISTER_STAT_3(x, T, expr) REGISTER_STAT(x, T)
+       #define REGISTER_STAT_3(x, T, expr) REGISTER_STAT_2(x, T)
 #elif defined(SVQC)
        /** Add all registered stats, access with `STAT(ID, player)` or `.type stat = _STAT(ID); player.stat` */
        void stats_add() {}
-       #define STAT(id, cl) (cl._STAT(id))
+       #define STAT(id, cl) (cl)._STAT(id)
 
        #define addstat_int(id, fld) addstat(id, AS_INT, fld)
        #define addstat_bool(id, fld) addstat(id, AS_INT, fld)
@@ -77,9 +77,8 @@ typedef vector vectori;
        #define _STAT(id) stat_##id
        #define REGISTER_STAT_2(id, T) \
                .T _STAT(id); \
-               REGISTER(Stats, STAT_##id, m_id, new(stat)) \
+               REGISTER(Stats, STAT_##id, m_id, new_pure(stat)) \
                { \
-                       make_pure(this); \
                        if (#T == "vector" || #T == "vectori") { \
                                REGISTRY_RESERVE(Stats, m_id, STAT_##id, y); \
                                REGISTRY_RESERVE(Stats, m_id, STAT_##id, z); \
@@ -87,16 +86,17 @@ typedef vector vectori;
                } \
                [[accumulate]] void stats_add() \
                { \
-                       addstat_##T(STAT_##id.m_id, _STAT(id)); \
+                       .T fld = _STAT(id); \
+                       addstat_##T(STAT_##id.m_id, fld); \
                }
        void GlobalStats_update(entity this) {}
-    #define REGISTER_STAT_3(x, T, expr) \
-       REGISTER_STAT(x, T); \
-       [[accumulate]] void GlobalStats_update(entity this) { STAT(x, this) = (expr); } \
-       STATIC_INIT(worldstat_##x) { entity this = world; STAT(x, this) = (expr); }
+    #define REGISTER_STAT_3(id, T, expr) \
+       REGISTER_STAT_2(id, T); \
+       [[accumulate]] void GlobalStats_update(entity this) { STAT(id, this) = (expr); } \
+       STATIC_INIT(worldstat_##id) { entity this = world; STAT(id, this) = (expr); }
 #else
        #define REGISTER_STAT_2(id, type)
-    #define REGISTER_STAT_3(x, T, expr)
+    #define REGISTER_STAT_3(id, T, expr)
 #endif
 
 const int STATS_ENGINE_RESERVE = 32;
@@ -107,10 +107,8 @@ REGISTRY_SORT(Stats)
 REGISTRY_CHECK(Stats)
 STATIC_INIT(RegisterStats_renumber)
 {
-       FOREACH(Stats, true, LAMBDA(it.m_id = STATS_ENGINE_RESERVE + i));
+       FOREACH(Stats, true, it.m_id = STATS_ENGINE_RESERVE + i);
 }
 #ifdef SVQC
 STATIC_INIT(stats_add) { stats_add(); }
 #endif
-
-#endif