Fix demo playback support

nukeykt · Jun 28, 2023 · 0833b76 · 0833b76
1 parent 3843a7f
commit 0833b76
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/source/blood/src/demo.cpp b/source/blood/src/demo.cpp
@@ -582,7 +582,7 @@ void CDemo::ReadInput(int nCount)
             pInput->syncFlags.run = bitReader.readBit();
             bitReader.skipBits(26);
             pInput->forward = bitReader.readSigned(8) << 8;
-            pInput->q16turn = fix16_from_int(bitReader.readSigned(16) >> 2);
+            pInput->q16turn = fix16_from_int(bitReader.readSigned(16)) >> 2;
             pInput->strafe = bitReader.readSigned(8) << 8;
             pInput->buttonFlags.jump = bitReader.readBit();
             pInput->buttonFlags.crouch = bitReader.readBit();

diff --git a/source/blood/src/player.cpp b/source/blood/src/player.cpp
@@ -1482,7 +1482,12 @@ void ProcessInput(PLAYER *pPlayer)
         }
     }
     if (pInput->q16turn)
-        pPlayer->q16ang = (pPlayer->q16ang+pInput->q16turn)&0x7ffffff;
+    {
+        if (bVanilla)
+            pPlayer->q16ang = ((pPlayer->q16ang&0x7ff0000)+(pInput->q16turn&0x7ff0000))&0x7ffffff;
+        else
+            pPlayer->q16ang = (pPlayer->q16ang+pInput->q16turn)&0x7ffffff;
+    }
     if (pInput->keyFlags.spin180)
     {
         if (!pPlayer->spin)

diff --git a/source/blood/src/view.cpp b/source/blood/src/view.cpp
@@ -423,7 +423,12 @@ void fakeProcessInput(PLAYER *pPlayer, GINPUT *pInput)
         }
     }
     if (pInput->q16turn)
-        predict.at30 = (predict.at30+pInput->q16turn)&0x7ffffff;
+    {
+        if (bVanilla)
+            predict.at30 = ((predict.at30&0x7ff0000)+(pInput->q16turn&0x7ff0000))&0x7ffffff;
+        else
+            predict.at30 = (predict.at30+pInput->q16turn)&0x7ffffff;
+    }
     if (pInput->keyFlags.spin180)
         if (!predict.at4c)
             predict.at4c = -kAng180;