From: Florian Paul Schmidt Date: Sun, 21 Mar 2010 00:55:07 +0000 (+0100) Subject: - removed commented out lines X-Git-Tag: xonotic-v0.1.0preview~680^2~14 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=309aaef301a4242c05a6efff805810bc4b59db7c;p=xonotic%2Fxonotic-data.pk3dir.git - removed commented out lines --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index c3c6db764..9e723179f 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -516,6 +516,7 @@ set g_dodging 0 "set to 1 to enable dodging in games" seta cl_dodging_timeout 0 "determines how long apart (in seconds) two taps on the same direction key are considered a dodge. use 0 to disable" +set sv_dodging_walldodging 0 "set to 1 to allow dodging off walls. 0 to disable" set sv_dodging_delay 0.5 "determines how long a player has to wait to be able to dodge again after dodging" set sv_dodging_up_speed 200 "the jump velocity of the dodge" set sv_dodging_horiz_speed 350 "the horizontal velocity of the dodge" diff --git a/qcsrc/server/mutators/mutator_dodging.qc b/qcsrc/server/mutators/mutator_dodging.qc index 8fea811ac..bc660f0c9 100644 --- a/qcsrc/server/mutators/mutator_dodging.qc +++ b/qcsrc/server/mutators/mutator_dodging.qc @@ -124,13 +124,10 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) { traceline(trace_start, trace_end, TRUE, self); height_above_ground = self.origin_z - trace_endpos_z; + // check if our feet are on the ground or at least close :D if (height_above_ground > (fabs(PL_MIN_z) + cvar("sv_dodging_height_threshold"))) return 0; - // check if our feet are on the ground or at least close :D - //if (!(self.lastflags & FL_ONGROUND)) - // return 0; - if (self.movement_x > 0) { // is this a state change? if (!(self.pressedkeys & KEY_FORWARD)) {