Cleanup and improve dodging code implementation

[voretournament/voretournament.git] / data / qcsrc / server / cl_client.qc

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 255ebc2fd6cafc6948ca83783248adeda0d69ef5..b41bb1d06110f9aedd67ab6ba17801398635a783 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -2027,20 +2027,13 @@ void SetZoomState(float z)
        zoomstate_set = 1;\r
 }\r
 \r
-void dodging_pressedkeys()\r
+// get pressed keys for PlayerDodge\r
+void PlayerDodge_GetPressedKeys()\r
 {\r
        float length;\r
        float tap_direction_x;\r
        float tap_direction_y;\r
-\r
-       tap_direction_x = 0;\r
-       tap_direction_y = 0;\r
-\r
        float dodge_detected;\r
-       if (!cvar("g_dodging"))\r
-               return;\r
-\r
-       dodge_detected = 0;\r
 \r
        // first check if the last dodge is far enough back in time so we can dodge again\r
        if ((time - self.last_dodging_time) < cvar("sv_dodging_delay"))\r
@@ -2094,7 +2087,6 @@ void dodging_pressedkeys()
                }\r
        }\r
 \r
-\r
        if (dodge_detected == 1) {\r
                self.last_dodging_time = time;\r
 \r
@@ -2111,16 +2103,15 @@ void dodging_pressedkeys()
                length = length + self.dodging_direction_y * self.dodging_direction_y;\r
                length = sqrt(length);\r
 \r
-               self.dodging_direction_x = self.dodging_direction_x * 1.0/length;\r
-               self.dodging_direction_y = self.dodging_direction_y * 1.0/length;\r
+               self.dodging_direction_x = self.dodging_direction_x * 1.0 / length;\r
+               self.dodging_direction_y = self.dodging_direction_y * 1.0 / length;\r
        }\r
-\r
-       return;\r
 }\r
 \r
 void GetPressedKeys(void) {\r
        // get keys for dodging\r
-       dodging_pressedkeys();\r
+       if(cvar("g_dodging"))\r
+               PlayerDodge_GetPressedKeys();\r
 \r
        if (self.movement_x > 0) // get if movement keys are pressed\r
        {       // forward key pressed\r