X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fstats.qh;h=f0ea92d6345e347c12d40116ed63fac1c8390c68;hb=40b838075e618d6075fdaa25f2f00b223be3712e;hp=4642f76403c3124b6cdc30fb9b3f923263394548;hpb=3e21073f2bd7f282947bc1f214b3ec25d69ccae0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/stats.qh b/qcsrc/lib/stats.qh
index 4642f7640..f0ea92d63 100644
--- a/qcsrc/lib/stats.qh
+++ b/qcsrc/lib/stats.qh
@@ -11,7 +11,42 @@ USING(vectori, vector);
 const int STATS_ENGINE_RESERVE = 32;
 // must be listed in ascending order
 #define MAGIC_STATS(_, x) \
+	_(x, MOVEVARS_AIRACCEL_QW_STRETCHFACTOR, 220) \
+	_(x, MOVEVARS_AIRCONTROL_PENALTY, 221) \
+	_(x, MOVEVARS_AIRSPEEDLIMIT_NONQW, 222) \
+	_(x, MOVEVARS_AIRSTRAFEACCEL_QW, 223) \
+	_(x, MOVEVARS_AIRCONTROL_POWER, 224) \
+	_(x, MOVEFLAGS, 225) \
+	_(x, MOVEVARS_WARSOWBUNNY_AIRFORWARDACCEL, 226) \
+	_(x, MOVEVARS_WARSOWBUNNY_ACCEL, 227) \
+	_(x, MOVEVARS_WARSOWBUNNY_TOPSPEED, 228) \
+	_(x, MOVEVARS_WARSOWBUNNY_TURNACCEL, 229) \
+	_(x, MOVEVARS_WARSOWBUNNY_BACKTOSIDERATIO, 230) \
+	_(x, MOVEVARS_AIRSTOPACCELERATE, 231) \
+	_(x, MOVEVARS_AIRSTRAFEACCELERATE, 232) \
+	_(x, MOVEVARS_MAXAIRSTRAFESPEED, 233) \
+	_(x, MOVEVARS_AIRCONTROL, 234) \
+	_(x, FRAGLIMIT, 235) \
+	_(x, TIMELIMIT, 236) \
+	_(x, MOVEVARS_WALLFRICTION, 237) \
+	_(x, MOVEVARS_FRICTION, 238) \
+	_(x, MOVEVARS_WATERFRICTION, 239) \
+	_(x, MOVEVARS_TICRATE, 240) \
 	_(x, MOVEVARS_TIMESCALE, 241) \
+	_(x, MOVEVARS_GRAVITY, 242) \
+	_(x, MOVEVARS_STOPSPEED, 243) \
+	_(x, MOVEVARS_MAXSPEED, 244) \
+	_(x, MOVEVARS_SPECTATORMAXSPEED, 245) \
+	_(x, MOVEVARS_ACCELERATE, 246) \
+	_(x, MOVEVARS_AIRACCELERATE, 247) \
+	_(x, MOVEVARS_WATERACCELERATE, 248) \
+	_(x, MOVEVARS_ENTGRAVITY, 249) \
+	_(x, MOVEVARS_JUMPVELOCITY, 250) \
+	_(x, MOVEVARS_EDGEFRICTION, 251) \
+	_(x, MOVEVARS_MAXAIRSPEED, 252) \
+	_(x, MOVEVARS_STEPHEIGHT, 253) \
+	_(x, MOVEVARS_AIRACCEL_QW, 254) \
+	_(x, MOVEVARS_AIRACCEL_SIDEWAYS_FRICTION, 255) \
 	/**/
 
 int g_magic_stats_hole = 0;
@@ -33,8 +68,8 @@ int g_magic_stats_hole = 0;
 	void stats_get() {}
 	#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))
+    #define STAT_1(id) (RVALUE, _STAT(id))
+	#define STAT_2(id, cl) STAT_1(id)
 
 	#define getstat_int(id) getstati(id, 0, 24)
 	#define getstat_bool(id) boolean(getstati(id))
@@ -53,7 +88,7 @@ int g_magic_stats_hole = 0;
 				REGISTRY_RESERVE(Stats, m_id, STAT_##id, z); \
 			} \
 		} \
-		[[accumulate]] void stats_get() \
+		ACCUMULATE void stats_get() \
 		{ \
 			T it = getstat_##T(STAT_##id.m_id); \
 			/* if (it != CAT(_STAT(id), _prev)) \
@@ -61,31 +96,37 @@ int g_magic_stats_hole = 0;
 		}
 	#define REGISTER_STAT_3(x, T, expr) REGISTER_STAT_2(x, T)
 #elif defined(SVQC)
+    /** Internal use only */
+    entity STATS;
 	/** 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(...) EVAL_STAT(OVERLOAD_(STAT, __VA_ARGS__))
+    #define EVAL_STAT(...) __VA_ARGS__
+    #define STAT_1(id) (RVALUE, STAT_2(id, STATS))
+	#define STAT_2(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)
 	#define addstat_float(id, fld) addstat(id, AS_FLOAT, fld)
-	#define addstat_vector(id, fld) MACRO_BEGIN { \
+	#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); \
-	} MACRO_END
-	#define addstat_vectori(id, fld) MACRO_BEGIN { \
+	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); \
-	} MACRO_END
+	MACRO_END
 	const int AS_STRING = 1;
 	const int AS_INT = 2;
 	const int AS_FLOAT = 8;
 
 	.int __stat_null;
-	/** Prevent engine stats being sent */
-	STATIC_INIT(stats_clear)
+	STATIC_INIT(stats)
 	{
+		STATS = new_pure(stats);
+		// Prevent engine stats being sent
 		int r = STATS_ENGINE_RESERVE;
 		for (int i = 0, n = 256 - r; i < n; ++i) {
 			#define X(_, name, id) if (i == id) continue;
@@ -105,16 +146,19 @@ int g_magic_stats_hole = 0;
 				REGISTRY_RESERVE(Stats, m_id, STAT_##id, z); \
 			} \
 		} \
-		[[accumulate]] void stats_add() \
+		ACCUMULATE void stats_add() \
 		{ \
 			.T fld = _STAT(id); \
 			addstat_##T(STAT_##id.m_id, fld); \
 		}
 	void GlobalStats_update(entity this) {}
+	void GlobalStats_updateglobal() {}
+    /** TODO: do we want the global copy to update? */
     #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 = NULL; STAT(id, this) = (expr); }
+    	ACCUMULATE void GlobalStats_update(entity this) { STAT(id, this) = (expr); } \
+    	ACCUMULATE void GlobalStats_updateglobal() { entity this = STATS; STAT(id, this) = (expr); } \
+    	STATIC_INIT(worldstat_##id) { entity this = STATS; STAT(id, this) = (expr); }
 #else
 	#define REGISTER_STAT_2(id, type)
     #define REGISTER_STAT_3(id, T, expr)
@@ -124,7 +168,9 @@ REGISTRY(Stats, 256 - STATS_ENGINE_RESERVE)
 REGISTER_REGISTRY(Stats)
 REGISTRY_SORT(Stats)
 REGISTRY_CHECK(Stats)
-STATIC_INIT(RegisterStats_renumber)
+
+REGISTRY_DEFINE_GET(Stats, NULL)
+STATIC_INIT(Stats_renumber)
 {
 	FOREACH(Stats, true, {
 		it.m_id = STATS_ENGINE_RESERVE + i;