Fix conformPedRotation drift while ped is moving forwards

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -3942,6 +3942,9 @@ void CClientGame::PreWorldProcessHandler()
 
 void CClientGame::PostWorldProcessHandler()
 {
+    if (m_pManager->IsGameLoaded())
+        m_pManager->GetPedManager()->ReapplyScriptRotations();
+
     m_pManager->GetMarkerManager()->DoPulse();
     m_pManager->GetPointLightsManager()->DoPulse();
     m_pManager->GetObjectManager()->DoPulse();
@@ -3958,6 +3961,9 @@ void CClientGame::PostWorldProcessHandler()
 
 void CClientGame::PostWorldProcessPedsAfterPreRenderHandler()
 {
+    if (m_pManager->IsGameLoaded())
+        m_pManager->GetPedManager()->ReapplyScriptRotations();
+
     CLuaArguments Arguments;
     m_pRootEntity->CallEvent("onClientPedsProcessed", Arguments, false);
 }

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -738,6 +738,27 @@ void CClientPed::SetCurrentRotationNew(float fRotation)
     SetRotationRadiansNew(CVector(0, 0, fRotation));
 }
 
+void CClientPed::SetScriptRotationOverride(const CVector& vecRotationRadians, bool bNewWay)
+{
+    m_bHasScriptRotationOverride = true;
+    m_bScriptRotationNewWay = bNewWay;
+    m_vecScriptRotation = vecRotationRadians;
+}
+
+void CClientPed::ReapplyScriptRotationIfNeeded()
+{
+    if (!m_bHasScriptRotationOverride || !m_pPlayerPed)
+        return;
+
+    if (GetRealOccupiedVehicle())
+        return;
+
+    if (m_bScriptRotationNewWay)
+        SetRotationRadiansNew(m_vecScriptRotation);
+    else
+        SetRotationRadians(m_vecScriptRotation);
+}
+
 void CClientPed::Spawn(const CVector& vecPosition, float fRotation, unsigned short usModel, unsigned char ucInterior)
 {
     // Remove us from our car
@@ -779,6 +800,7 @@ void CClientPed::Spawn(const CVector& vecPosition, float fRotation, unsigned sho
 
     // Set some states
     SetFrozen(false);
+    ClearScriptRotationOverride();
     Teleport(vecPosition);
     SetCurrentRotationNew(fRotation);
     SetHealth(GetMaxHealth());

Client/mods/deathmatch/logic/CClientPed.h

@@ -202,6 +202,11 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
     void SetRotationRadiansNew(const CVector& vecRotation);
     void SetCurrentRotationNew(float fRotation);
 
+    void SetScriptRotationOverride(const CVector& vecRotationRadians, bool bNewWay);
+    void ClearScriptRotationOverride() noexcept { m_bHasScriptRotationOverride = false; }
+    void ReapplyScriptRotationIfNeeded();
+    bool HasScriptRotationOverride() const noexcept { return m_bHasScriptRotationOverride; }
+
     void Teleport(const CVector& vecPosition);
 
     // This function spawns/respawns this ped in any location. This will force a recreation
@@ -748,6 +753,9 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
     uint                                     m_uiFrameLastRebuildPlayer;
     bool                                     m_bIsSyncing;
     bool                                     m_shouldRecreate{false};
+    bool                                     m_bHasScriptRotationOverride{};
+    bool                                     m_bScriptRotationNewWay{};
+    CVector                                  m_vecScriptRotation{};
 
     bool             m_bBulletImpactData;
     CClientEntityPtr m_pBulletImpactEntity;

Client/mods/deathmatch/logic/CClientPedManager.cpp

@@ -75,6 +75,12 @@ bool CClientPedManager::Exists(CClientPed* pPed)
     return false;
 }
 
+void CClientPedManager::ReapplyScriptRotations()
+{
+    for (uint i = 0; i < m_StreamedIn.size(); i++)
+        m_StreamedIn[i]->ReapplyScriptRotationIfNeeded();
+}
+
 void CClientPedManager::RemoveFromList(CClientPed* pPed)
 {
     if (m_bRemoveFromList)

Client/mods/deathmatch/logic/CClientPedManager.h

@@ -42,6 +42,8 @@ class CClientPedManager
     void RestreamAllPeds();
     void RestreamWeapon(unsigned short usModel);
 
+    void ReapplyScriptRotations();
+
 protected:
     CClientPedManager(class CClientManager* pManager);
     ~CClientPedManager();

Client/mods/deathmatch/logic/CClientVehicle.cpp

@@ -4187,6 +4187,7 @@ void CClientVehicle::SetPedOccupiedVehicle(CClientPed* pClientPed, CClientVehicl
     // Ped vars
     pClientPed->m_pOccupiedVehicle = pVehicle;
     pClientPed->m_uiOccupiedVehicleSeat = uiSeat;
+    pClientPed->ClearScriptRotationOverride();
 
     if (ucDoor != 0xFF)
         pVehicle->AllowDoorRatioSetting(ucDoor, true);

Client/mods/deathmatch/logic/CNetAPI.cpp

@@ -737,6 +737,7 @@ void CNetAPI::WriteKeysync(CClientPed* pPlayerModel, NetBitStreamInterface& BitS
     WriteSmallKeysync(ControllerState, BitStream);
 
     // Write the rotations
+    pPlayerModel->ReapplyScriptRotationIfNeeded();
     SKeysyncRotation rotation;
     rotation.data.fPlayerRotation = pPlayerModel->GetCurrentRotation();
     rotation.data.fCameraRotation = pPlayerModel->GetCameraRotation();
@@ -1187,6 +1188,7 @@ void CNetAPI::WritePlayerPuresync(CClientPlayer* pPlayerModel, NetBitStreamInter
     BitStream.Write(&position);
 
     // Player rotation
+    pPlayerModel->ReapplyScriptRotationIfNeeded();
     SPedRotationSync rotation;
     rotation.data.fRotation = pPlayerModel->GetCurrentRotation();
     BitStream.Write(&rotation);

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -1092,20 +1092,18 @@ bool CStaticFunctionDefinitions::SetElementRotation(CClientEntity& Entity, const
         case CCLIENTPLAYER:
         {
             CClientPed& Ped = static_cast<CClientPed&>(Entity);
-            if (argumentRotOrder == EULER_DEFAULT || argumentRotOrder == EULER_MINUS_ZYX)
-            {
-                if (bNewWay)
-                    Ped.SetRotationDegreesNew(vecRotation);
-                else
-                    Ped.SetRotationDegrees(vecRotation);
-            }
+            CVector     vecUseRotation = vecRotation;
+            if (argumentRotOrder != EULER_DEFAULT && argumentRotOrder != EULER_MINUS_ZYX)
+                vecUseRotation = ConvertEulerRotationOrder(vecRotation, argumentRotOrder, EULER_MINUS_ZYX);
+
+            if (bNewWay)
+                Ped.SetRotationDegreesNew(vecUseRotation);
             else
-            {
-                if (bNewWay)
-                    Ped.SetRotationDegreesNew(ConvertEulerRotationOrder(vecRotation, argumentRotOrder, EULER_MINUS_ZYX));
-                else
-                    Ped.SetRotationDegrees(ConvertEulerRotationOrder(vecRotation, argumentRotOrder, EULER_MINUS_ZYX));
-            }
+                Ped.SetRotationDegrees(vecUseRotation);
+
+            CVector vecRotationRadians = vecUseRotation;
+            ConvertDegreesToRadiansNoWrap(vecRotationRadians);
+            Ped.SetScriptRotationOverride(vecRotationRadians, bNewWay);
             break;
         }
         case CCLIENTVEHICLE:
@@ -2225,6 +2223,8 @@ bool CStaticFunctionDefinitions::SetPedRotation(CClientEntity& Entity, float fRo
 
         if (!IS_PLAYER(&Entity))
             Ped.SetCameraRotation(-fRadians);
+
+        Ped.SetScriptRotationOverride(CVector(0.0f, 0.0f, fRadians), bNewWay);
         return true;
     }
 

Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp

@@ -79,6 +79,8 @@ void CPedRPCs::SetPedRotation(CClientEntity* pSource, NetBitStreamInterface& bit
 
             if (!IS_PLAYER(pPed))
                 pPed->SetCameraRotation(rotation.data.fRotation);
+
+            pPed->SetScriptRotationOverride(CVector(0.0f, 0.0f, rotation.data.fRotation), ucNewWay == 1);
             pPed->SetSyncTimeContext(ucTimeContext);
         }
     }