X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstats.qh;h=ed37073fbeec0867b2b54e587204ca693ecb7126;hp=3b7311f6e9b21611aee4eeffb13a1796213111cc;hb=8055762a482cc2ba1d4735e193938c00c7d8d660;hpb=2afec0885c14c3c9d6cc58377ed7794f376bfa01 diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh index 3b7311f6e9..ed37073fbe 100644 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@ -43,8 +43,12 @@ const int MAX_CL_STATS = 256; #endif #ifdef SVQC +/// all the weapons actually spawned in the map, does not include filtered items vector weaponsInMap; +/// all the weapons placed by the mapper (weaponreplace applied), ignores most filters +vector weaponsInMapAll; #endif + REGISTER_STAT(WEAPONS, vectori) REGISTER_STAT(WEAPONSINMAP, vectori, weaponsInMap) @@ -73,7 +77,6 @@ REGISTER_STAT(GAMESTARTTIME, float, game_starttime) REGISTER_STAT(STRENGTH_FINISHED, float) REGISTER_STAT(INVINCIBLE_FINISHED, float) /** arc heat in [0,1] */ -REGISTER_STAT(ARC_HEAT, float) REGISTER_STAT(PRESSED_KEYS, int) /** this stat could later contain some other bits of info, like, more server-side particle config */ REGISTER_STAT(ALLOW_OLDVORTEXBEAM, bool, autocvar_g_allow_oldvortexbeam) @@ -82,20 +85,12 @@ REGISTER_STAT(NB_METERSTART, float) /** compressShotOrigin */ REGISTER_STAT(SHOTORG, int) REGISTER_STAT(LEADLIMIT, float, autocvar_leadlimit) -REGISTER_STAT(WEAPON_CLIPLOAD, int) -REGISTER_STAT(WEAPON_CLIPSIZE, int) -REGISTER_STAT(VORTEX_CHARGE, float) -REGISTER_STAT(OVERKILL_NEX_CHARGE, float) REGISTER_STAT(LAST_PICKUP, float) REGISTER_STAT(HUD, int) -REGISTER_STAT(VORTEX_CHARGEPOOL, float) -REGISTER_STAT(OVERKILL_NEX_CHARGEPOOL, float) REGISTER_STAT(HIT_TIME, float) REGISTER_STAT(DAMAGE_DEALT_TOTAL, int) REGISTER_STAT(TYPEHIT_TIME, float) -REGISTER_STAT(LAYED_MINES, int) -REGISTER_STAT(HAGAR_LOAD, int) REGISTER_STAT(SUPERWEAPONS_FINISHED, float) REGISTER_STAT(VEHICLESTAT_HEALTH, int) REGISTER_STAT(VEHICLESTAT_SHIELD, int) @@ -129,6 +124,13 @@ REGISTER_STAT(ENTRAP_ORB, float) REGISTER_STAT(ENTRAP_ORB_ALPHA, float) REGISTER_STAT(ITEMSTIME, int, autocvar_sv_itemstime) REGISTER_STAT(KILL_TIME, float) +REGISTER_STAT(VEIL_ORB, float) +REGISTER_STAT(VEIL_ORB_ALPHA, float) + +#ifdef SVQC +float autocvar_sv_showfps = 5; +#endif +REGISTER_STAT(SHOWFPS, float, autocvar_sv_showfps) #ifdef SVQC bool autocvar_g_ctf_leaderboard; @@ -185,20 +187,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")) @@ -278,6 +290,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) @@ -303,11 +320,23 @@ bool autocvar_sv_slick_applygravity; #endif REGISTER_STAT(SLICK_APPLYGRAVITY, bool, autocvar_sv_slick_applygravity) +#ifdef SVQC +bool autocvar_sv_q3defragcompat; +#endif +REGISTER_STAT(Q3DEFRAGCOMPAT, bool, autocvar_sv_q3defragcompat) + #ifdef SVQC #include "physics/movetypes/movetypes.qh" float warmup_limit; #endif +#ifdef SVQC +bool autocvar_g_shootfromcenter; +bool autocvar_g_shootfromeye; +#endif +REGISTER_STAT(SHOOTFROMEYE, bool, autocvar_g_shootfromeye) +REGISTER_STAT(SHOOTFROMCENTER, bool, autocvar_g_shootfromcenter) + REGISTER_STAT(MOVEVARS_AIRACCEL_QW_STRETCHFACTOR, float) REGISTER_STAT(MOVEVARS_AIRCONTROL_PENALTY, float) REGISTER_STAT(MOVEVARS_AIRSPEEDLIMIT_NONQW, float) @@ -315,7 +344,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) @@ -355,15 +384,11 @@ REGISTER_STAT(MOVEVARS_STEPHEIGHT, float, autocvar_sv_stepheight) REGISTER_STAT(MOVEVARS_AIRACCEL_QW, float) REGISTER_STAT(MOVEVARS_AIRACCEL_SIDEWAYS_FRICTION, float) REGISTER_STAT(MOVEVARS_SPECIALCOMMAND, bool) - - -#ifdef CSQC -noref int autocvar_cl_gunalign; -#endif #ifdef SVQC -.int cvar_cl_gunalign; -REPLICATE(cvar_cl_gunalign, int, "cl_gunalign"); +int autocvar_sv_wallclip; #endif +REGISTER_STAT(MOVEVARS_WALLCLIP, int, autocvar_sv_wallclip) + REGISTER_STAT(GUNALIGN, int) #ifdef SVQC SPECTATE_COPYFIELD(_STAT(GUNALIGN))