X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_dodging.qc;h=ad52d3e2919f29a3563927a4c900ca401f35ee40;hb=99facb38338832f539cec7022c414f7a6de458c3;hp=3f808499a8d4a5bd015b28ceec3a86d62797b3b2;hpb=d2aa2e833adeef6854046076d65472310ac9f542;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_dodging.qc b/qcsrc/server/mutators/mutator_dodging.qc
index 3f808499a..ad52d3e29 100644
--- a/qcsrc/server/mutators/mutator_dodging.qc
+++ b/qcsrc/server/mutators/mutator_dodging.qc
@@ -9,8 +9,7 @@
 .float last_RIGHT_KEY_time;
 
 // these store the movement direction at the time of the dodge action happening.
-.float dodging_direction_x;
-.float dodging_direction_y;
+.vector dodging_direction;
 
 // this indicates the last time a dodge was executed. used to check if another one is allowed
 // and to ramp up the dodge acceleration in the physics hook.
@@ -35,7 +34,7 @@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) {
 	float clean_up_and_do_nothing;
 	float horiz_speed = autocvar_sv_dodging_horiz_speed;
 
-	if(self.freezetag_frozen)
+	if(self.frozen)
 		horiz_speed = autocvar_sv_dodging_horiz_speed_frozen;
 
     if (self.deadflag != DEAD_NO)
@@ -79,12 +78,12 @@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) {
 	// ramp up dodging speed by adding some velocity each frame.. TODO: do it! :D
 	if (self.dodging_action == 1) {
 		//disable jump key during dodge accel phase
-		if (self.movement_z > 0) self.movement_z = 0;
+		if (self.movement.z > 0) self.movement_z = 0;
 
 		self.velocity =
 			  self.velocity
-			+ ((self.dodging_direction_y * velocity_difference) * v_right)
-			+ ((self.dodging_direction_x * velocity_difference) * v_forward);
+			+ ((self.dodging_direction.y * velocity_difference) * v_right)
+			+ ((self.dodging_direction.x * velocity_difference) * v_forward);
 
 		self.dodging_velocity_gain = self.dodging_velocity_gain - velocity_difference;
 	}
@@ -100,7 +99,7 @@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) {
 		if (autocvar_sv_dodging_sound == 1)
 			PlayerSound(playersound_jump, CH_PLAYER, VOICETYPE_PLAYERSOUND);
 
-		animdecide_setaction(self, ANIMACTION_JUMP, TRUE);
+		animdecide_setaction(self, ANIMACTION_JUMP, true);
 
 		self.dodging_single_action = 0;
 	}
@@ -129,22 +128,22 @@ float check_close_to_wall(float threshold) {
 	trace_start = self.origin;
 
 	trace_end = self.origin + (1000*v_right);
-	tracebox(trace_start, self.mins, self.maxs, trace_end, TRUE, self);
+	tracebox(trace_start, self.mins, self.maxs, trace_end, true, self);
 	if (trace_fraction < 1 && vlen (self.origin - trace_endpos) < threshold)
 		return 1;
 
 	trace_end = self.origin - (1000*v_right);
-	tracebox(trace_start, self.mins, self.maxs, trace_end, TRUE, self);
+	tracebox(trace_start, self.mins, self.maxs, trace_end, true, self);
 	if (trace_fraction < 1 && vlen (self.origin - trace_endpos) < threshold)
 		return 1;
 
 	trace_end = self.origin + (1000*v_forward);
-	tracebox(trace_start, self.mins, self.maxs, trace_end, TRUE, self);
+	tracebox(trace_start, self.mins, self.maxs, trace_end, true, self);
 	if (trace_fraction < 1 && vlen (self.origin - trace_endpos) < threshold)
 		return 1;
 
 	trace_end = self.origin - (1000*v_forward);
-	tracebox(trace_start, self.mins, self.maxs, trace_end, TRUE, self);
+	tracebox(trace_start, self.mins, self.maxs, trace_end, true, self);
 	if (trace_fraction < 1 && vlen (self.origin - trace_endpos) < threshold)
 		return 1;
 
@@ -163,14 +162,11 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
 	// print("dodging_PlayerPhysics\n");
 
 	float length;
-	float tap_direction_x;
-	float tap_direction_y;
+	vector tap_direction = '0 0 0';
 
-	tap_direction_x = 0;
-	tap_direction_y = 0;
-
-	float frozen_dodging;
-	frozen_dodging = (self.freezetag_frozen && autocvar_sv_dodging_frozen);
+	float frozen_dodging, frozen_no_doubletap;
+	frozen_dodging = (self.frozen && autocvar_sv_dodging_frozen);
+	frozen_no_doubletap = (frozen_dodging && !autocvar_sv_dodging_frozen_doubletap);
 
 	float dodge_detected;
 	if (g_dodging == 0)
@@ -186,21 +182,21 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
 		&& check_close_to_wall(autocvar_sv_dodging_wall_distance_threshold) != 1)
 		return 0;
 
-	if (self.movement_x > 0) {
+	if (self.movement.x > 0) {
 		// is this a state change?
-		if (!(self.pressedkeys & KEY_FORWARD) || frozen_dodging) {
+		if (!(self.pressedkeys & KEY_FORWARD) || frozen_no_doubletap) {
 			if ((time - self.last_FORWARD_KEY_time) < self.cvar_cl_dodging_timeout)	{
-				tap_direction_x = 1.0;
+				tap_direction.x = 1.0;
 				dodge_detected = 1;
 			}
  			self.last_FORWARD_KEY_time = time;
  		}
 	}
 
-	if (self.movement_x < 0) {
+	if (self.movement.x < 0) {
 		// is this a state change?
- 		if (!(self.pressedkeys & KEY_BACKWARD) || frozen_dodging) {
-			tap_direction_x = -1.0;
+ 		if (!(self.pressedkeys & KEY_BACKWARD) || frozen_no_doubletap) {
+			tap_direction.x = -1.0;
 			if ((time - self.last_BACKWARD_KEY_time) < self.cvar_cl_dodging_timeout)	{
 				dodge_detected = 1;
 			}
@@ -208,10 +204,10 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
  		}
 	}
 
-	if (self.movement_y > 0) {
+	if (self.movement.y > 0) {
 		// is this a state change?
-		if (!(self.pressedkeys & KEY_RIGHT) || frozen_dodging) {
-			tap_direction_y = 1.0;
+		if (!(self.pressedkeys & KEY_RIGHT) || frozen_no_doubletap) {
+			tap_direction.y = 1.0;
 			if ((time - self.last_RIGHT_KEY_time) < self.cvar_cl_dodging_timeout)	{
 				dodge_detected = 1;
 			}
@@ -219,10 +215,10 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
  		}
 	}
 
-	if (self.movement_y < 0) {
+	if (self.movement.y < 0) {
 		// is this a state change?
-		if (!(self.pressedkeys & KEY_LEFT) || frozen_dodging) {
-			tap_direction_y = -1.0;
+		if (!(self.pressedkeys & KEY_LEFT) || frozen_no_doubletap) {
+			tap_direction.y = -1.0;
 			if ((time - self.last_LEFT_KEY_time) < self.cvar_cl_dodging_timeout)	{
 				dodge_detected = 1;
 			}
@@ -238,16 +234,16 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
 
 		self.dodging_velocity_gain = autocvar_sv_dodging_horiz_speed;
 
-		self.dodging_direction_x = tap_direction_x;
-		self.dodging_direction_y = tap_direction_y;
+		self.dodging_direction_x = tap_direction.x;
+		self.dodging_direction_y = tap_direction.y;
 
 		// normalize the dodging_direction vector.. (unlike UT99) XD
-		length =          self.dodging_direction_x * self.dodging_direction_x;
-		length = length + self.dodging_direction_y * self.dodging_direction_y;
+		length =          self.dodging_direction.x * self.dodging_direction.x;
+		length = length + self.dodging_direction.y * self.dodging_direction.y;
 		length = sqrt(length);
 
-		self.dodging_direction_x = self.dodging_direction_x * 1.0/length;
-		self.dodging_direction_y = self.dodging_direction_y * 1.0/length;
+		self.dodging_direction_x = self.dodging_direction.x * 1.0/length;
+		self.dodging_direction_y = self.dodging_direction.y * 1.0/length;
 	}
 
 	return 0;