Merge branch 't0uYK8Ne/set_slick_friction' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / dodging / sv_dodging.qc

diff --git a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc
index c8182cdd88e5985789ca50a52f390bad2f8b96b2..c97308d58ab1f8cd8a7db8adcd738c277baa739e 100644 (file)
--- a/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc
+++ b/qcsrc/common/mutators/mutator/dodging/sv_dodging.qc
@@ -40,10 +40,12 @@
 #endif
 
 #ifdef CSQC
+       float cvar_cl_dodging_timeout;
        #define PHYS_DODGING_FRAMETIME                          (1 / (frametime <= 0 ? 60 : frametime))
        #define PHYS_DODGING_TIMEOUT(s)                         STAT(DODGING_TIMEOUT)
        #define PHYS_DODGING_PRESSED_KEYS(s)            (s).pressedkeys
 #elif defined(SVQC)
+       .float cvar_cl_dodging_timeout;
        #define PHYS_DODGING_FRAMETIME                          sys_frametime
        #define PHYS_DODGING_TIMEOUT(s)                         CS(s).cvar_cl_dodging_timeout
        #define PHYS_DODGING_PRESSED_KEYS(s)            CS(s).pressedkeys
@@ -56,8 +58,6 @@ bool autocvar_sv_dodging_sound;
 #include <common/animdecide.qh>
 #include <common/physics/player.qh>
 
-.float cvar_cl_dodging_timeout;
-
 REGISTER_MUTATOR(dodging, cvar("g_dodging"))
 {
        // this just turns on the cvar.
@@ -156,10 +156,8 @@ bool PM_dodging_checkpressedkeys(entity this)
        if (mymovement_##COND) {                                                                                                                                                                \
                /* is this a state change? */                                                                                                                                           \
                if(!(PHYS_DODGING_PRESSED_KEYS(this) & KEY_##BTN) || frozen_no_doubletap) {                                                     \
-                       /*LOG_INFOF("key press %f - %s\n", time, #BTN);*/                                                                                                       \
                        tap_direction_##RESULT;                                                                                                                                                 \
                        if ((time - this.last_##BTN##_KEY_time) < PHYS_DODGING_TIMEOUT(this) || frozen_no_doubletap) {  \
-                               /*LOG_INFOF("dodge repress %f (%s)\n", time - this.last_##BTN##_KEY_time, this.netname);*/              \
                                dodge_detected = true;                                                                                                                                          \
                        } else if(PHYS_INPUT_BUTTON_DODGE(this)) {                                                                                                              \
                                dodge_detected = true;                                                                                                                                          \
@@ -174,7 +172,6 @@ bool PM_dodging_checkpressedkeys(entity this)
        #undef X
 
        if (!dodge_detected) return false;
-       //LOG_INFOF("dodge keys detected %f - delay %f - %s\n", time, time - this.last_dodging_time, this.netname);
 
        // this check has to be after checking keys:
        // the first key press of the double tap is allowed to be before dodging delay,
@@ -197,7 +194,6 @@ bool PM_dodging_checkpressedkeys(entity this)
 
        this.dodging_force_total = determine_force(this);
        this.dodging_force_remaining = this.dodging_force_total;
-       //LOG_INFOF("speed %d -> %f\n", vlen(vec2(this.velocity)), this.dodging_force_total);
 
        this.dodging_direction.x = tap_direction_x;
        this.dodging_direction.y = tap_direction_y;
@@ -241,7 +237,6 @@ void PM_dodging(entity this)
 
        float velocity_increase = min(common_factor * this.dodging_force_total, this.dodging_force_remaining);
        this.dodging_force_remaining -= velocity_increase;
-       //LOG_INFOF("time %f velocity_increase: %f\n", time, velocity_increase);
        this.velocity += this.dodging_direction.x * velocity_increase * v_forward
                       + this.dodging_direction.y * velocity_increase * v_right;
 
@@ -293,7 +288,6 @@ void PM_dodging_GetPressedKeys(entity this)
 MUTATOR_HOOKFUNCTION(dodging, PlayerPhysics)
 {
        entity player = M_ARGV(0, entity);
-       //LOG_INFOF("player %s, physics %f\n", player.netname, time);
 
 #ifdef CSQC
        PM_dodging_GetPressedKeys(player);
@@ -308,7 +302,6 @@ REPLICATE(cvar_cl_dodging_timeout, float, "cl_dodging_timeout");
 MUTATOR_HOOKFUNCTION(dodging, GetPressedKeys)
 {
        entity player = M_ARGV(0, entity);
-       //LOG_INFOF("player %s, keys %f\n", player.netname, time);
 
        PM_dodging_checkpressedkeys(player);
 }