From: Mario <mario.mario@y7mail.com>
Date: Wed, 5 Jun 2013 00:31:52 +0000 (+1000)
Subject: Merge branch 'master' into Mario/rifle_arena
X-Git-Tag: xonotic-v0.8.0~366^2~23^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ec74997f484755f09e1f4b2d8dc0ba3dd5c0343d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/rifle_arena
---

ec74997f484755f09e1f4b2d8dc0ba3dd5c0343d
diff --cc defaultXonotic.cfg
index 9dce045c3,66ac0b20b..3428112b1
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -463,6 -463,6 +463,7 @@@ set sv_dodging_wall_dodging 0 "set to 
  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 400 "the horizontal velocity of the dodge"
++set sv_dodging_horiz_speed_frozen 200 "the horizontal velocity of the dodge (while frozen)"
  set sv_dodging_ramp_time 0.1 "a ramp so that the horizontal part of the dodge is added smoothly (seconds)"
  set sv_dodging_height_threshold 10 "the maximum height above ground where to allow dodging"
  set sv_dodging_wall_distance_threshold 10 "the maximum distance from a wall that still allows dodging"
diff --cc qcsrc/server/autocvars.qh
index 65fd9b2e9,dead5a9d4..ef695c318
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@@ -1110,6 -1110,6 +1110,7 @@@ float autocvar_sv_defaultplayerskin
  float autocvar_sv_dodging_delay;
  float autocvar_sv_dodging_height_threshold;
  float autocvar_sv_dodging_horiz_speed;
++float autocvar_sv_dodging_horiz_speed_frozen;
  float autocvar_sv_dodging_ramp_time;
  float autocvar_sv_dodging_sound;
  float autocvar_sv_dodging_up_speed;
diff --cc qcsrc/server/mutators/mutator_dodging.qc
index 674954efd,1d6dd911e..0101b98c5
--- a/qcsrc/server/mutators/mutator_dodging.qc
+++ b/qcsrc/server/mutators/mutator_dodging.qc
@@@ -33,6 -39,6 +33,10 @@@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhys
  	float new_velocity_gain;
  	float velocity_difference;
  	float clean_up_and_do_nothing;
++	float horiz_speed = autocvar_sv_dodging_horiz_speed;
++	
++	if(self.freezetag_frozen)
++		horiz_speed = autocvar_sv_dodging_horiz_speed_frozen;
  
      if (self.deadflag != DEAD_NO)
          return 0;
@@@ -66,7 -72,7 +70,7 @@@
  	if (common_factor > 1) 
  		common_factor = 1;
  
--	new_velocity_gain = self.dodging_velocity_gain - (common_factor * autocvar_sv_dodging_horiz_speed);
++	new_velocity_gain = self.dodging_velocity_gain - (common_factor * horiz_speed);
  	if (new_velocity_gain < 0)
  		new_velocity_gain = 0;