From: terencehill Date: Sun, 12 Apr 2020 15:57:59 +0000 (+0200) Subject: Don't define g_stat_ACTIVEWEAPON and stat_ACTIVEWEAPON since we don't use STAT_ACTIVE... X-Git-Tag: xonotic-v0.8.5~1121^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a1beea889a010c452841a7749c46a83aadd99ae0;p=xonotic%2Fxonotic-data.pk3dir.git Don't define g_stat_ACTIVEWEAPON and stat_ACTIVEWEAPON since we don't use STAT_ACTIVEWEAPON; g_stat_ aren't directly referenced, in case they will define them with getstati as it's the way ammo stats are currently obtained ( getstati(GetAmmoStat(ammoType)) ) --- diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh index a63148f50..c77ca16be 100644 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@ -16,18 +16,16 @@ const int MAX_CL_STATS = 256; // const int STAT_NAILS = 7; // const int STAT_ROCKETS = 8; // const int STAT_CELLS = 9; -// const int STAT_ACTIVEWEAPON = 10; // const int STAT_ITEMS = 15; // .items | .items2 << 23 | serverflags << 28 // const int STAT_VIEWHEIGHT = 16; #if defined(CSQC) #define g_stat_HEALTH getstati(STAT_HEALTH) #define g_stat_ARMOR getstati(STAT_ARMOR) - #define g_stat_SHELLS getstat_int(STAT_SHELLS) - #define g_stat_NAILS getstat_int(STAT_NAILS) - #define g_stat_ROCKETS getstat_int(STAT_ROCKETS) - #define g_stat_CELLS getstat_int(STAT_CELLS) - #define g_stat_ACTIVEWEAPON getstat_int(STAT_ACTIVEWEAPON) + #define g_stat_SHELLS getstati(STAT_SHELLS) + #define g_stat_NAILS getstati(STAT_NAILS) + #define g_stat_ROCKETS getstati(STAT_ROCKETS) + #define g_stat_CELLS getstati(STAT_CELLS) #define g_stat_ITEMS getstat_int(STAT_ITEMS) #define g_stat_VIEWHEIGHT getstati(STAT_VIEWHEIGHT) #elif defined(SVQC) @@ -37,7 +35,6 @@ const int MAX_CL_STATS = 256; #define stat_NAILS ammo_nails #define stat_ROCKETS ammo_rockets #define stat_CELLS ammo_cells - #define stat_ACTIVEWEAPON weapon #define stat_ITEMS items #define stat_VIEWHEIGHT view_ofs_z #endif