Sync to wall collision

vabold · May 13, 2024 · e7ad4c0 · e7ad4c0
1 parent 293f569
commit e7ad4c0
Showing 1 changed file with 26 additions and 8 deletions.
diff --git a/source/game/kart/KartMove.cc b/source/game/kart/KartMove.cc
@@ -625,6 +625,11 @@ void KartMove::calcRotation() {
         turn = param()->stats().handlingManualTightness;
     }
 
+    bool forwards = true;
+    if (state()->isBrake() && m_speed <= 0.0f) {
+        forwards = false;
+    }
+
     turn *= m_realTurn;
     if (state()->isChargingSsmt()) {
         turn = m_realTurn * 0.04f;
@@ -635,18 +640,27 @@ void KartMove::calcRotation() {
 
         if (!drifting) {
             if (EGG::Mathf::abs(m_speed) < 1.0f) {
-                turn = 0.0f;
+                if (!(state()->isHop() && m_hopPosY > 0.0f)) {
+                    turn = 0.0f;
+                    goto ABS_SPEED_EDGECASE;
+                }
             }
-
-            if (m_speed >= 20.0f) {
-                turn *= 0.5f;
-                if (m_speed < 70.0f) {
-                    turn += (1.0f - (m_speed - 20.0f) / 50.0f) * turn;
+            if (forwards) {
+                if (m_speed >= 20.0f) {
+                    turn *= 0.5f;
+                    if (m_speed < 70.0f) {
+                        turn += (1.0f - (m_speed - 20.0f) / 50.0f) * turn;
+                    }
+                } else {
+                    turn = (turn * 0.4f) + (m_speed / 20.0f) * (turn * 0.6f);
                 }
-            } else {
-                turn = (turn * 0.4f) + (m_speed / 20.0f) * (turn * 0.6f);
             }
         }
+
+    ABS_SPEED_EDGECASE:
+        if (!forwards) {
+            turn = -turn;
+        }
     }
 
     if (!state()->isTouchingGround()) {
@@ -673,6 +687,10 @@ void KartMove::calcVehicleSpeed() {
         }
     }
 
+    if (m_speed < -20.0f) {
+        m_speed += 0.5f;
+    }
+
     m_acceleration = 0.0f;
     m_speedDragMultiplier = 1.0f;