]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Call the setpressedkeys functions in the right place (doesn't fix prediction, but...
authorMario <zacjardine@y7mail.com>
Thu, 11 Dec 2014 02:59:50 +0000 (13:59 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 11 Dec 2014 02:59:50 +0000 (13:59 +1100)
qcsrc/common/physics.qc
qcsrc/server/mutators/mutator_dodging.qc

index db60f2cb99947979c2166ac6f764f246084038d5..58705e993372e9d7102eecdc1b0adcdc2063de85 100644 (file)
@@ -1767,6 +1767,11 @@ void CSQC_ClientMovement_PlayerMove_Frame()
                // we REALLY need this handling to happen, even if the move is not executed
                if (!(PHYS_INPUT_BUTTONS(self) & 2)) // !jump
                        UNSET_JUMP_HELD(self); // canjump = true
+
+#ifdef CSQC
+       PM_dodging_checkpressedkeys();
+       PM_dodging_updatepressedkeys();
+#endif
 }
 
 #ifdef SVQC
index 203d19b4de6d73c0fca14df17386c594fb6274ac..92faa6a40e45d9486c0d244b9cc55b9710b6b5cc 100644 (file)
@@ -310,10 +310,6 @@ void PM_dodging_checkpressedkeys()
                self.dodging_direction_x = self.dodging_direction_x * 1.0/length;
                self.dodging_direction_y = self.dodging_direction_y * 1.0/length;
        }
-
-#ifdef CSQC
-       PM_dodging_updatepressedkeys();
-#endif
 }
 
 void PM_dodging()
@@ -410,10 +406,6 @@ void PM_dodging()
                self.dodging_direction_x = 0;
                self.dodging_direction_y = 0;
        }
-
-#ifdef CSQC
-       PM_dodging_checkpressedkeys();
-#endif
 }
 
 #ifdef SVQC