X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fstats.qh;h=5a2b53b69f3796da2c23802c617567d221ddbeb6;hb=b8880819e333ef558143ae80afcdb339b907a439;hp=1100c474cb9eb49074cd85d08431fd0f0ba61012;hpb=ecd018b0f2a99be972759503e3efea35b6717ee9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/stats.qh b/qcsrc/lib/stats.qh
index 1100c474c..5a2b53b69 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;
@@ -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)) \
@@ -73,16 +108,16 @@ int g_magic_stats_hole = 0;
 	#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;
@@ -111,16 +146,18 @@ 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); } \
+    	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)
@@ -131,7 +168,7 @@ REGISTRY(Stats, 256 - STATS_ENGINE_RESERVE)
 REGISTER_REGISTRY(Stats)
 REGISTRY_SORT(Stats)
 REGISTRY_CHECK(Stats)
-STATIC_INIT(RegisterStats_renumber)
+STATIC_INIT(Stats_renumber)
 {
 	FOREACH(Stats, true, {
 		it.m_id = STATS_ENGINE_RESERVE + i;