- Exhumed: Move player's velocity back into the actor, again.

* Was done in 67c7dd65f9 but caused issues.
* Reverted in 3d6f1e1a04 to ensure the game worked as expected.
* Actual problem identified and isolated to remove this duplication.

source/games/exhumed/src/player.cpp

@@ -296,7 +296,6 @@ void RestartPlayer(int nPlayer)
 	pPlayer->nAir = 100;
     pPlayer->pPlayerGrenade = nullptr;
     pPlayer->dVertPan = 0;
-    pPlayer->vel.Zero();
     pPlayer->nThrust.Zero();
     pPlayer->nBreathTimer = 90;
     pPlayer->nTauntTimer = RandomSize(3) + 3;
@@ -1113,21 +1112,19 @@ static void updatePlayerVelocity(Player* const pPlayer)
 
         for (int i = 0; i < 4; i++)
         {
-            pPlayer->vel += inputvect;
+            pPlayerActor->vel.XY() += inputvect;
-            pPlayer->vel *= 0.953125;
+            pPlayerActor->vel.XY() *= 0.953125;
             pPlayer->Angles.StrafeVel += pInput->svel * 0.375;
             pPlayer->Angles.StrafeVel *= 0.953125;
         }
     }
 
-    if (pPlayer->vel.Length() < 0.09375 && !pPlayer->vel.isZero())
+    if (pPlayerActor->vel.XY().Length() < 0.09375 && !pPlayerActor->vel.XY().isZero())
     {
-        pPlayer->vel.Zero();
+        pPlayerActor->vel.Zero();
         pPlayer->nIdxBobZ = 0;
         pPlayer->Angles.StrafeVel = 0;
     }
-
-    pPlayerActor->vel.XY() = pPlayer->vel;
 }
 
 //---------------------------------------------------------------------------
@@ -1521,7 +1518,6 @@ static void doPlayerRamses(Player* const pPlayer)
     if (nTotalPlayers <= 1)
     {
         pPlayer->pActor->vel.Zero();
-        pPlayer->vel.Zero();
 
         if (nFreeze < 1)
         {
@@ -1580,7 +1576,7 @@ static void doPlayerCameraEffects(Player* const pPlayer, const double nDestVertP
         pPlayer->nIdxBobZ *= !pPlayerActor->vel.Z;
 
         // Increment bob value with index's sine, amplified by player velocity, bob type and bob height CVAR.
-        const auto nBobVel = (pPlayer->vel.Length() < 0.09375 && nUnderwater) ? (maxVel / 3.) : pPlayer->totalvel;
+        const auto nBobVel = (pPlayerActor->vel.XY().Length() < 0.09375 && nUnderwater) ? (maxVel / 3.) : pPlayer->totalvel;
         const auto nBobAmp = nBobVel * 0.05 * cl_viewbob * cl_exviewbobheight;
         const auto newBobZ = BobVal(pPlayer->nIdxBobZ) * nBobAmp;
         pPlayer->nBobZ = (cl_viewbob == 2) ? (abs(newBobZ) - nBobAmp * 0.5 * !nUnderwater) : (newBobZ);
@@ -1740,7 +1736,7 @@ static void doPlayerMovingBlocks(Player* const pPlayer, const Collision& nMove,
     else if ((sect->hitag == 45) && pPlayer->bTouchFloor && absangle(nNormal, pPlayerActor->spr.Angles.Yaw + DAngle180) <= DAngle45)
     {
         pPlayer->pPlayerPushSect = sect;
-        DVector2 vel = pPlayer->vel;
+        DVector2 vel = pPlayerActor->vel.XY();
         const auto nMyAngle = vel.Angle().Normalized360();
 
         setsectinterpolate(sect);

source/games/exhumed/src/player.h

@@ -75,7 +75,6 @@ struct Player
 
     InputPacket input;
     PlayerAngles Angles;
-    DVector2 vel;
     sectortype* pPlayerPushSect;
     sectortype* pPlayerViewSect;
 

source/games/exhumed/src/runlist.cpp

@@ -1783,16 +1783,20 @@ int runlist_CheckRadialDamage(DExhumedActor* pActor)
             }
             else if (edi > 20)
             {
-                auto nAngle = pos.Angle();
+                const auto nVel = DVector3(pos.Angle().ToVector() * 128., -24 * (1. / 256.)) * edi;
-				pActor->vel.XY() += nAngle.ToVector() * edi * 128;
+                pActor->vel.Z += nVel.Z;
-
-                pActor->vel.Z = (- edi * 24) / 256.;
 
                 if (pActor->vel.Z < -14)
 					pActor->vel.Z = -14;
 
                 if (pActor->spr.statnum == 100)
+                {
                     PlayerList[GetPlayerFromActor(pActor)].bJumping = true;
+                }
+                else
+                {
+                    pActor->vel.XY() += nVel.XY();
+                }
             }
         }