X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fmutators%2Fmutator_dodging.qc;h=58d24a4d820c526376026c84bfa1c774e1506545;hb=1aac6cbd00e98ca537937fdc9490216a50cf3caa;hp=ad52d3e2919f29a3563927a4c900ca401f35ee40;hpb=1a65f7bb6bae1bb6d1a40d3e2eda30c822052313;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/mutator_dodging.qc b/qcsrc/server/mutators/mutator_dodging.qc index ad52d3e29..58d24a4d8 100644 --- a/qcsrc/server/mutators/mutator_dodging.qc +++ b/qcsrc/server/mutators/mutator_dodging.qc @@ -96,7 +96,7 @@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) { self.velocity + (autocvar_sv_dodging_up_speed * v_up); - if (autocvar_sv_dodging_sound == 1) + if (autocvar_sv_dodging_sound) PlayerSound(playersound_jump, CH_PLAYER, VOICETYPE_PLAYERSOUND); animdecide_setaction(self, ANIMACTION_JUMP, true); @@ -118,9 +118,10 @@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) { // returns 1 if the player is close to a wall -float check_close_to_wall(float threshold) { - if (autocvar_sv_dodging_wall_dodging == 0) - return 0; +bool check_close_to_wall(float threshold) +{ + if(!autocvar_sv_dodging_wall_dodging) + return false; vector trace_start; vector trace_end; @@ -130,31 +131,32 @@ float check_close_to_wall(float threshold) { trace_end = self.origin + (1000*v_right); tracebox(trace_start, self.mins, self.maxs, trace_end, true, self); if (trace_fraction < 1 && vlen (self.origin - trace_endpos) < threshold) - return 1; + return true; trace_end = self.origin - (1000*v_right); tracebox(trace_start, self.mins, self.maxs, trace_end, true, self); if (trace_fraction < 1 && vlen (self.origin - trace_endpos) < threshold) - return 1; + return true; trace_end = self.origin + (1000*v_forward); tracebox(trace_start, self.mins, self.maxs, trace_end, true, self); if (trace_fraction < 1 && vlen (self.origin - trace_endpos) < threshold) - return 1; + return true; trace_end = self.origin - (1000*v_forward); tracebox(trace_start, self.mins, self.maxs, trace_end, true, self); if (trace_fraction < 1 && vlen (self.origin - trace_endpos) < threshold) - return 1; + return true; - return 0; + return false; } -float check_close_to_ground(float threshold) { +bool check_close_to_ground(float threshold) +{ if (self.flags & FL_ONGROUND) - return 1; + return true; - return 0; + return false; }