From: Florian Paul Schmidt <mista.tapas@gmx.net>
Date: Fri, 19 Mar 2010 23:16:08 +0000 (+0100)
Subject: - meeeh
X-Git-Tag: xonotic-v0.1.0preview~680^2~26
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e1012cda1b11791aac3b68fa84fd9e0dbb6d2295

- meeeh
---

diff --git a/qcsrc/server/mutators/mutator_dodging.qc b/qcsrc/server/mutators/mutator_dodging.qc
index 7134ba900d..93d5da3e90 100644
--- a/qcsrc/server/mutators/mutator_dodging.qc
+++ b/qcsrc/server/mutators/mutator_dodging.qc
@@ -28,22 +28,13 @@ void dodging_Initialize() {
 }
 
 MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) {
-	float length;
-
 	// print("physics hook\n");
 	if (g_dodging == 0)
 		return 0;
 
-	length += self.dodging_direction_x * self.dodging_direction_x;
-	length += self.dodging_direction_y * self.dodging_direction_y;
-	length = sqrt(length);
-
-	self.dodging_direction_x *= 1/length;
-	self.dodging_direction_y *= 1/length;
-
 	// ramp up dodging speed by adding some velocity each frame..
 	if (self.dodging_action == 1) {
-		self.velocity = self.velocity + self.dodging_direction_y * (cvar("sv_dodging_horiz_speed") * v_right) + self.dodging_direction_x * (cvar("sv_dodging_horiz_speed") * v_forward) + (cvar("sv_dodging_up_speed") * v_up);//'100 0 50';
+		self.velocity = self.velocity + self.dodging_direction_y * (cvar("sv_dodging_horiz_speed") * v_right) + self.dodging_direction_x * (cvar("sv_dodging_horiz_speed") * v_forward) + (cvar("sv_dodging_up_speed") * v_up);
 		self.dodging_action = 0;
 	}
 
@@ -55,11 +46,14 @@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) {
 }
 
 MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
+	float length;
 	//print("dodging_hook\n");
 
 	if (g_dodging == 0)
 		return 0;
 
+	self.dodging_direction_x = 0;
+	self.dodging_direction_y = 0;
 	if (self.movement_x > 0) // get if movement keys are pressed
    {       // forward key pressed
    	if (!(self.pressedkeys & KEY_FORWARD)) {        // is this a state change?
@@ -69,10 +63,7 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
 				((time - self.last_dodging_time) > cvar("sv_dodging_delay"))
  			) { // are we allowed to dodge?
 				self.dodging_action = 1;
-				self.dodging_direction_x = self.movement_x;
-				self.dodging_direction_y = self.movement_y;
-
-
+				self.dodging_direction_x = 1;
 				self.last_dodging_time = time;
 			}
  			self.last_FORWARD_KEY_time = time;
@@ -88,13 +79,21 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
 				((time - self.last_dodging_time) > cvar("sv_dodging_delay"))
  			) { // are we allowed to dodge?
 				self.dodging_action = 1;
-				// self.velocity = self.velocity + (cvar("sv_dodging_horiz_speed") * v_forward) + (cvar("sv_dodging_up_speed") * v_up);//'100 0 50';
+				self.dodging_direction_x = -1;
 				self.last_dodging_time = time;
 			}
  			self.last_BACKWARD_KEY_time = time;
  		}
 	}
 
+	// normalize the dodging_direction vector.. 
+	length += self.dodging_direction_x * self.dodging_direction_x;
+	length += self.dodging_direction_y * self.dodging_direction_y;
+	length = sqrt(length);
+
+	self.dodging_direction_x *= 1/length;
+	self.dodging_direction_y *= 1/length;
+
 	return 0;
 }