X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstats.qh;h=c77ca16be2a432043f0d8808fa1506b25b0d3a7d;hb=ba1679d72b9a726f53c206467c665ed8b75c5426;hp=9fc79cdc98852451623dacbc67a5d72cbe57c49e;hpb=815bcc74c7f64dcb4a3ad63f40a844706743f682;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh index 9fc79cdc9..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 getstat_int(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_ARMOR getstati(STAT_ARMOR) + #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 @@ -85,6 +82,7 @@ REGISTER_STAT(NB_METERSTART, float) /** compressShotOrigin */ REGISTER_STAT(SHOTORG, int) REGISTER_STAT(LEADLIMIT, float, autocvar_leadlimit) +REGISTER_STAT(LEADLIMIT_AND_FRAGLIMIT, float, autocvar_leadlimit_and_fraglimit) REGISTER_STAT(LAST_PICKUP, float) REGISTER_STAT(HUD, int) @@ -92,6 +90,7 @@ REGISTER_STAT(HIT_TIME, float) REGISTER_STAT(DAMAGE_DEALT_TOTAL, int) REGISTER_STAT(TYPEHIT_TIME, float) REGISTER_STAT(SUPERWEAPONS_FINISHED, float) +REGISTER_STAT(AIR_FINISHED, float) REGISTER_STAT(VEHICLESTAT_HEALTH, int) REGISTER_STAT(VEHICLESTAT_SHIELD, int) REGISTER_STAT(VEHICLESTAT_ENERGY, int) @@ -143,11 +142,13 @@ float autocvar_g_multijump_add; float autocvar_g_multijump_speed; float autocvar_g_multijump_maxspeed; float autocvar_g_multijump_dodging = 1; +bool autocvar_g_multijump_client = true; #endif REGISTER_STAT(MULTIJUMP_DODGING, int, autocvar_g_multijump_dodging) REGISTER_STAT(MULTIJUMP_MAXSPEED, float, autocvar_g_multijump_maxspeed) REGISTER_STAT(MULTIJUMP_ADD, int, autocvar_g_multijump_add) REGISTER_STAT(MULTIJUMP_SPEED, float, autocvar_g_multijump_speed) +REGISTER_STAT(MULTIJUMP_CLIENT, bool, autocvar_g_multijump_client) .int multijump_count; REGISTER_STAT(MULTIJUMP_COUNT, int, this.multijump_count) REGISTER_STAT(MULTIJUMP, int, autocvar_g_multijump) @@ -187,20 +188,30 @@ REGISTER_STAT(BUGRIGS_SPEED_REF, float, g_bugrigs_speed_ref) REGISTER_STAT(BUGRIGS_STEER, float, g_bugrigs_steer) #ifdef SVQC -int autocvar_sv_gameplayfix_downtracesupportsongroundflag; -int autocvar_sv_gameplayfix_easierwaterjump; -int autocvar_sv_gameplayfix_stepdown; -int autocvar_sv_gameplayfix_stepmultipletimes; -int autocvar_sv_gameplayfix_unstickplayers; -int autocvar_sv_gameplayfix_fixedcheckwatertransition; +int autocvar_sv_gameplayfix_downtracesupportsongroundflag = 1; +int autocvar_sv_gameplayfix_easierwaterjump = 1; +int autocvar_sv_gameplayfix_stepdown = 2; +float autocvar_sv_gameplayfix_stepdown_maxspeed = 0; +int autocvar_sv_gameplayfix_stepmultipletimes = 1; +int autocvar_sv_gameplayfix_unstickplayers = 1; +int autocvar_sv_gameplayfix_fixedcheckwatertransition = 1; +int autocvar_sv_gameplayfix_slidemoveprojectiles = 1; +int autocvar_sv_gameplayfix_grenadebouncedownslopes = 1; +int autocvar_sv_gameplayfix_noairborncorpse = 1; +int autocvar_sv_gameplayfix_noairborncorpse_allowsuspendeditems = 1; #endif REGISTER_STAT(GAMEPLAYFIX_DOWNTRACEONGROUND, int, autocvar_sv_gameplayfix_downtracesupportsongroundflag) REGISTER_STAT(GAMEPLAYFIX_EASIERWATERJUMP, int, autocvar_sv_gameplayfix_easierwaterjump) REGISTER_STAT(GAMEPLAYFIX_STEPDOWN, int, autocvar_sv_gameplayfix_stepdown) +REGISTER_STAT(GAMEPLAYFIX_STEPDOWN_MAXSPEED, float, autocvar_sv_gameplayfix_stepdown_maxspeed) REGISTER_STAT(GAMEPLAYFIX_STEPMULTIPLETIMES, int, autocvar_sv_gameplayfix_stepmultipletimes) REGISTER_STAT(GAMEPLAYFIX_UNSTICKPLAYERS, int, autocvar_sv_gameplayfix_unstickplayers) REGISTER_STAT(GAMEPLAYFIX_UPVELOCITYCLEARSONGROUND, int, autocvar_sv_gameplayfix_upwardvelocityclearsongroundflag) REGISTER_STAT(GAMEPLAYFIX_WATERTRANSITION, int, autocvar_sv_gameplayfix_fixedcheckwatertransition) +REGISTER_STAT(GAMEPLAYFIX_SLIDEMOVEPROJECTILES, int, autocvar_sv_gameplayfix_slidemoveprojectiles) +REGISTER_STAT(GAMEPLAYFIX_GRENADEBOUNCESLOPES, int, autocvar_sv_gameplayfix_grenadebouncedownslopes) +REGISTER_STAT(GAMEPLAYFIX_NOAIRBORNCORPSE, int, autocvar_sv_gameplayfix_noairborncorpse) +REGISTER_STAT(NOAIRBORNCORPSE_ALLOWSUSPENDED, int, autocvar_sv_gameplayfix_noairborncorpse_allowsuspendeditems) REGISTER_STAT(MOVEVARS_JUMPSTEP, int, cvar("sv_jumpstep")) REGISTER_STAT(NOSTEP, int, cvar("sv_nostep")) @@ -232,6 +243,7 @@ bool autocvar_sv_dodging_wall_dodging; bool autocvar_sv_dodging_air_dodging; float autocvar_sv_dodging_maxspeed; float autocvar_sv_dodging_air_maxspeed; +bool autocvar_sv_dodging_clientselect; #endif #if 0 @@ -251,6 +263,7 @@ REGISTER_STAT(DODGING_WALL, bool, autocvar_sv_dodging_wall_dodging) REGISTER_STAT(DODGING_AIR, bool, autocvar_sv_dodging_air_dodging) REGISTER_STAT(DODGING_MAXSPEED, float, autocvar_sv_dodging_maxspeed) REGISTER_STAT(DODGING_AIR_MAXSPEED, float, autocvar_sv_dodging_air_maxspeed) +REGISTER_STAT(DODGING_CLIENTSELECT, bool, autocvar_sv_dodging_clientselect) #endif /** cvar loopback */ REGISTER_STAT(DODGING_FROZEN, int, autocvar_sv_dodging_frozen) @@ -280,6 +293,11 @@ REGISTER_STAT(WALLJUMP_DELAY, float, autocvar_g_walljump_delay) REGISTER_STAT(WALLJUMP_FORCE, float, autocvar_g_walljump_force) REGISTER_STAT(LASTWJ, float) +#ifdef SVQC +float autocvar_g_bloodloss; +#endif +REGISTER_STAT(BLOODLOSS, float, autocvar_g_bloodloss) + // freeze tag, clan arena REGISTER_STAT(REDALIVE, int) REGISTER_STAT(BLUEALIVE, int) @@ -306,9 +324,9 @@ bool autocvar_sv_slick_applygravity; REGISTER_STAT(SLICK_APPLYGRAVITY, bool, autocvar_sv_slick_applygravity) #ifdef SVQC -bool autocvar_sv_vq3compat; +bool autocvar_sv_q3defragcompat; #endif -REGISTER_STAT(VQ3COMPAT, bool, autocvar_sv_vq3compat) +REGISTER_STAT(Q3DEFRAGCOMPAT, bool, autocvar_sv_q3defragcompat) #ifdef SVQC #include "physics/movetypes/movetypes.qh" @@ -329,7 +347,7 @@ REGISTER_STAT(MOVEVARS_AIRSTRAFEACCEL_QW, float) REGISTER_STAT(MOVEVARS_AIRCONTROL_POWER, float) REGISTER_STAT(MOVEVARS_AIRCONTROL_BACKWARDS, bool) REGISTER_STAT(MOVEVARS_AIRCONTROL_SIDEWARDS, bool) -noref bool autocvar_sv_gameplayfix_nogravityonground; +noref bool autocvar_sv_gameplayfix_nogravityonground = true; REGISTER_STAT(MOVEFLAGS, int, MOVEFLAG_VALID | (autocvar_sv_gameplayfix_q2airaccelerate ? MOVEFLAG_Q2AIRACCELERATE : 0) | (autocvar_sv_gameplayfix_nogravityonground ? MOVEFLAG_NOGRAVITYONGROUND : 0) @@ -374,14 +392,6 @@ int autocvar_sv_wallclip; #endif REGISTER_STAT(MOVEVARS_WALLCLIP, int, autocvar_sv_wallclip) - -#ifdef CSQC -noref int autocvar_cl_gunalign; -#endif -#ifdef SVQC -.int cvar_cl_gunalign; -#endif - REGISTER_STAT(GUNALIGN, int) #ifdef SVQC SPECTATE_COPYFIELD(_STAT(GUNALIGN))