From 523577994af8574895ba2c76f12e0c1f7fdfb11a Mon Sep 17 00:00:00 2001 From: TimePath Date: Thu, 11 Dec 2014 13:37:45 +1100 Subject: [PATCH] Move dodging macros into mutator --- qcsrc/common/physics.qh | 26 -------------------- qcsrc/server/mutators/mutator_dodging.qc | 30 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/qcsrc/common/physics.qh b/qcsrc/common/physics.qh index 77666a15d..5757f0239 100644 --- a/qcsrc/common/physics.qh +++ b/qcsrc/common/physics.qh @@ -70,20 +70,7 @@ #define PHYS_JETPACK_MAXSPEED_UP getstatf(STAT_JETPACK_MAXSPEED_UP) #define PHYS_JETPACK_MAXSPEED_SIDE getstatf(STAT_JETPACK_MAXSPEED_SIDE) - #define PHYS_DODGING_FRAMETIME (1 / frametime <= 0 ? 60 : frametime) - #define PHYS_DODGING getstati(STAT_DODGING) - #define PHYS_DODGING_DELAY getstatf(STAT_DODGING_DELAY) - #define PHYS_DODGING_TIMEOUT(s) getstatf(STAT_DODGING_TIMEOUT) - #define PHYS_DODGING_HORIZ_SPEED_FROZEN getstatf(STAT_DODGING_HORIZ_SPEED_FROZEN) #define PHYS_DODGING_FROZEN getstati(STAT_DODGING_FROZEN) - #define PHYS_DODGING_FROZEN_NODOUBLETAP getstati(STAT_DODGING_FROZEN_NO_DOUBLETAP) - #define PHYS_DODGING_HORIZ_SPEED getstatf(STAT_DODGING_HORIZ_SPEED) - #define PHYS_DODGING_PRESSED_KEYS(s) s.pressedkeys - #define PHYS_DODGING_HEIGHT_THRESHOLD getstatf(STAT_DODGING_HEIGHT_THRESHOLD) - #define PHYS_DODGING_DISTANCE_THRESHOLD getstatf(STAT_DODGING_DISTANCE_THRESHOLD) - #define PHYS_DODGING_RAMP_TIME getstatf(STAT_DODGING_RAMP_TIME) - #define PHYS_DODGING_UP_SPEED getstatf(STAT_DODGING_UP_SPEED) - #define PHYS_DODGING_WALL getstatf(STAT_DODGING_WALL) #elif defined(SVQC) @@ -156,19 +143,6 @@ #define PHYS_JETPACK_MAXSPEED_UP autocvar_g_jetpack_maxspeed_up #define PHYS_JETPACK_MAXSPEED_SIDE autocvar_g_jetpack_maxspeed_side - #define PHYS_DODGING_FRAMETIME sys_frametime - #define PHYS_DODGING g_dodging - #define PHYS_DODGING_DELAY autocvar_sv_dodging_delay - #define PHYS_DODGING_TIMEOUT(s) s.cvar_cl_dodging_timeout - #define PHYS_DODGING_HORIZ_SPEED_FROZEN autocvar_sv_dodging_horiz_speed_frozen #define PHYS_DODGING_FROZEN autocvar_sv_dodging_frozen - #define PHYS_DODGING_FROZEN_NODOUBLETAP autocvar_sv_dodging_frozen_doubletap - #define PHYS_DODGING_HORIZ_SPEED autocvar_sv_dodging_horiz_speed - #define PHYS_DODGING_PRESSED_KEYS(s) s.pressedkeys - #define PHYS_DODGING_HEIGHT_THRESHOLD autocvar_sv_dodging_height_threshold - #define PHYS_DODGING_DISTANCE_THRESHOLD autocvar_sv_dodging_wall_distance_threshold - #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 #endif \ No newline at end of file diff --git a/qcsrc/server/mutators/mutator_dodging.qc b/qcsrc/server/mutators/mutator_dodging.qc index 45deeab04..203d19b4d 100644 --- a/qcsrc/server/mutators/mutator_dodging.qc +++ b/qcsrc/server/mutators/mutator_dodging.qc @@ -1,3 +1,33 @@ +#ifdef CSQC + #define PHYS_DODGING_FRAMETIME (1 / frametime <= 0 ? 60 : frametime) + #define PHYS_DODGING getstati(STAT_DODGING) + #define PHYS_DODGING_DELAY getstatf(STAT_DODGING_DELAY) + #define PHYS_DODGING_TIMEOUT(s) getstatf(STAT_DODGING_TIMEOUT) + #define PHYS_DODGING_HORIZ_SPEED_FROZEN getstatf(STAT_DODGING_HORIZ_SPEED_FROZEN) + #define PHYS_DODGING_FROZEN_NODOUBLETAP getstati(STAT_DODGING_FROZEN_NO_DOUBLETAP) + #define PHYS_DODGING_HORIZ_SPEED getstatf(STAT_DODGING_HORIZ_SPEED) + #define PHYS_DODGING_PRESSED_KEYS(s) s.pressedkeys + #define PHYS_DODGING_HEIGHT_THRESHOLD getstatf(STAT_DODGING_HEIGHT_THRESHOLD) + #define PHYS_DODGING_DISTANCE_THRESHOLD getstatf(STAT_DODGING_DISTANCE_THRESHOLD) + #define PHYS_DODGING_RAMP_TIME getstatf(STAT_DODGING_RAMP_TIME) + #define PHYS_DODGING_UP_SPEED getstatf(STAT_DODGING_UP_SPEED) + #define PHYS_DODGING_WALL getstatf(STAT_DODGING_WALL) +#elif defined(SVQC) + #define PHYS_DODGING_FRAMETIME sys_frametime + #define PHYS_DODGING g_dodging + #define PHYS_DODGING_DELAY autocvar_sv_dodging_delay + #define PHYS_DODGING_TIMEOUT(s) s.cvar_cl_dodging_timeout + #define PHYS_DODGING_HORIZ_SPEED_FROZEN autocvar_sv_dodging_horiz_speed_frozen + #define PHYS_DODGING_FROZEN_NODOUBLETAP autocvar_sv_dodging_frozen_doubletap + #define PHYS_DODGING_HORIZ_SPEED autocvar_sv_dodging_horiz_speed + #define PHYS_DODGING_PRESSED_KEYS(s) s.pressedkeys + #define PHYS_DODGING_HEIGHT_THRESHOLD autocvar_sv_dodging_height_threshold + #define PHYS_DODGING_DISTANCE_THRESHOLD autocvar_sv_dodging_wall_distance_threshold + #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 +#endif + #ifdef SVQC .float cvar_cl_dodging_timeout; -- 2.39.2