From 6d100a71dd5633df98e3f11dbddfcb6b9546c9d6 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 12 Mar 2017 02:09:47 +1000 Subject: [PATCH] Remove the dodging stats for now (prediction doesn't work) --- .../mutators/mutator/dodging/sv_dodging.qc | 18 +++++++++++++++++- qcsrc/common/stats.qh | 8 +++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc index 05201ebcf..9dda6aeb3 100644 --- a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc +++ b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc @@ -1,5 +1,21 @@ #include "sv_dodging.qh" +#define PHYS_DODGING g_dodging +#define PHYS_DODGING_DELAY autocvar_sv_dodging_delay +#define PHYS_DODGING_DISTANCE_THRESHOLD autocvar_sv_dodging_wall_distance_threshold +#define PHYS_DODGING_FROZEN_NODOUBLETAP autocvar_sv_dodging_frozen_doubletap +#define PHYS_DODGING_HEIGHT_THRESHOLD autocvar_sv_dodging_height_threshold +#define PHYS_DODGING_HORIZ_SPEED autocvar_sv_dodging_horiz_speed +#define PHYS_DODGING_HORIZ_SPEED_FROZEN autocvar_sv_dodging_horiz_speed_frozen +#define PHYS_DODGING_RAMP_TIME autocvar_sv_dodging_ramp_time +#define PHYS_DODGING_UP_SPEED autocvar_sv_dodging_up_speed +#define PHYS_DODGING_WALL autocvar_sv_dodging_wall_dodging +#define PHYS_DODGING_AIR autocvar_sv_dodging_air_dodging +#define PHYS_DODGING_MAXSPEED autocvar_sv_dodging_maxspeed +#define PHYS_DODGING_PRESSED_KEYS(s) (s).pressedkeys + +// we ran out of stats slots! TODO: re-enable this when prediction is available for dodging +#if 0 #define PHYS_DODGING STAT(DODGING, this) #define PHYS_DODGING_DELAY STAT(DODGING_DELAY, this) #define PHYS_DODGING_DISTANCE_THRESHOLD STAT(DODGING_DISTANCE_THRESHOLD, this) @@ -12,7 +28,7 @@ #define PHYS_DODGING_WALL STAT(DODGING_WALL, this) #define PHYS_DODGING_AIR STAT(DODGING_AIR, this) #define PHYS_DODGING_MAXSPEED STAT(DODGING_MAXSPEED, this) -#define PHYS_DODGING_PRESSED_KEYS(s) (s).pressedkeys +#endif #ifdef CSQC #define PHYS_DODGING_FRAMETIME (1 / (frametime <= 0 ? 60 : frametime)) diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh index a91aa5933..afde74324 100644 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@ -217,21 +217,23 @@ bool autocvar_sv_dodging_air_dodging; float autocvar_sv_dodging_maxspeed = 450; #endif +#if 0 REGISTER_STAT(DODGING, int, g_dodging) REGISTER_STAT(DODGING_DELAY, float, autocvar_sv_dodging_delay) REGISTER_STAT(DODGING_DISTANCE_THRESHOLD, float, autocvar_sv_dodging_wall_distance_threshold) -REGISTER_STAT(DODGING_FROZEN, int, autocvar_sv_dodging_frozen) REGISTER_STAT(DODGING_FROZEN_NO_DOUBLETAP, int, autocvar_sv_dodging_frozen_doubletap) REGISTER_STAT(DODGING_HEIGHT_THRESHOLD, float, autocvar_sv_dodging_height_threshold) REGISTER_STAT(DODGING_HORIZ_SPEED, float, autocvar_sv_dodging_horiz_speed) REGISTER_STAT(DODGING_HORIZ_SPEED_FROZEN, float, autocvar_sv_dodging_horiz_speed_frozen) REGISTER_STAT(DODGING_RAMP_TIME, float, autocvar_sv_dodging_ramp_time) -/** cvar loopback */ -REGISTER_STAT(DODGING_TIMEOUT, float) REGISTER_STAT(DODGING_UP_SPEED, float, autocvar_sv_dodging_up_speed) 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) +#endif +/** cvar loopback */ +REGISTER_STAT(DODGING_FROZEN, int, autocvar_sv_dodging_frozen) +REGISTER_STAT(DODGING_TIMEOUT, float) REGISTER_STAT(JETPACK_ACCEL_SIDE, float, autocvar_g_jetpack_acceleration_side) REGISTER_STAT(JETPACK_ACCEL_UP, float, autocvar_g_jetpack_acceleration_up) -- 2.39.2