X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_dodging.qc;h=1d6dd911eb7f958fad79b957c120e06575433530;hb=e14bb786305e05541496fb5b28c090e0ff1b5783;hp=1c05a4a091bed2799cd05c1067edf2b1c4562f36;hpb=f209ef256e1c8cc09fcfb1cf3b3f30f34345e88b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_dodging.qc b/qcsrc/server/mutators/mutator_dodging.qc
index 1c05a4a09..1d6dd911e 100644
--- a/qcsrc/server/mutators/mutator_dodging.qc
+++ b/qcsrc/server/mutators/mutator_dodging.qc
@@ -27,21 +27,6 @@
 // the jump part of the dodge cannot be ramped
 .float dodging_single_action;
 
-void dodging_Initialize() {
-	// print("dodging_Initialize\n");
-
-	self.last_FORWARD_KEY_time = 0;
-	self.last_BACKWARD_KEY_time = 0;
-	self.last_RIGHT_KEY_time = 0;
-	self.last_LEFT_KEY_time = 0;
-	self.last_dodging_time = 0;
-	self.dodging_action = 0;
-	self.dodging_velocity_gain = 0;
-	self.dodging_single_action = 0;
-	self.dodging_direction_x = 0;
-	self.dodging_direction_y = 0;
-}
-
 MUTATOR_HOOKFUNCTION(dodging_GetCvars) {
 	GetCvars_handleFloat(get_cvars_s, get_cvars_f, cvar_cl_dodging_timeout, "cl_dodging_timeout");
 	return 0;
@@ -55,6 +40,9 @@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) {
 	float velocity_difference;
 	float clean_up_and_do_nothing;
 
+    if (self.deadflag != DEAD_NO)
+        return 0;
+
 	new_velocity_gain = 0;
 	clean_up_and_do_nothing = 0;
 
@@ -112,9 +100,9 @@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) {
 			+ (autocvar_sv_dodging_up_speed * v_up);
 
 		if (autocvar_sv_dodging_sound == 1)
-			PlayerSound(playersound_jump, CHAN_PLAYER, VOICETYPE_PLAYERSOUND);
+			PlayerSound(playersound_jump, CH_PLAYER, VOICETYPE_PLAYERSOUND);
 
-		setanim(self, self.anim_jump, TRUE, FALSE, TRUE);
+		animdecide_setaction(self, ANIMACTION_JUMP, TRUE);
 
 		self.dodging_single_action = 0;
 	}
@@ -241,8 +229,6 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
  		}
 	}
 
-
-
 	if (dodge_detected == 1) {
 		self.last_dodging_time = time;
 
@@ -255,7 +241,7 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
 		self.dodging_direction_y = tap_direction_y;
 
 		// normalize the dodging_direction vector.. (unlike UT99) XD
-		length = length + self.dodging_direction_x * self.dodging_direction_x;
+		length =          self.dodging_direction_x * self.dodging_direction_x;
 		length = length + self.dodging_direction_y * self.dodging_direction_y;
 		length = sqrt(length);
 
@@ -282,14 +268,17 @@ MUTATOR_DEFINITION(mutator_dodging)
 	MUTATOR_ONADD
 	{
 		g_dodging = 1;
-		dodging_Initialize();
 	}
 
 	// this just turns off the cvar.
-	MUTATOR_ONREMOVE
-	{	 
+	MUTATOR_ONROLLBACK_OR_REMOVE
+	{
 		g_dodging = 0;
 	}
 
+	MUTATOR_ONREMOVE
+	{
+	}
+
 	return 0;
 }