Blood: Correct hearing velocity when transitioning through ror

nukeykt · Dec 18, 2024 · 14f1f56 · 14f1f56
1 parent c022985
commit 14f1f56
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/source/blood/src/actor.cpp b/source/blood/src/actor.cpp
@@ -4615,7 +4615,11 @@ void MoveDude(spritetype *pSprite)
             if (VanillaMode())
                 playerResetInertia(pPlayer);
             else
+            {
                 playerCorrectInertia(pPlayer, &oldpos);
+                if (pPlayer == gMe) // if player is listener, update ear position so audio pitch of surrounding sfx does not freak out when transitioning between ror sectors
+                    sfxCorrectListenerPos();
+            }
         }
         switch (nLink) {
         case kMarkerLowStack:

diff --git a/source/blood/src/sfx.cpp b/source/blood/src/sfx.cpp
@@ -456,6 +456,17 @@ inline void sfxUpdateListenerVel(void)
     earVR = {earR.x - earR0.x, earR.y - earR0.y};
 }
 
+void sfxCorrectListenerPos(void)
+{
+    sfxUpdateListenerPos();
+    earL0 = earL;
+    earR0 = earR;
+    earL0.x += -earVL.dx;
+    earL0.y += -earVL.dy;
+    earR0.x += -earVR.dx;
+    earR0.y += -earVR.dy;
+}
+
 void sfxResetListener(void)
 {
     sfxUpdateListenerPos(); // update ear position

diff --git a/source/blood/src/sfx.h b/source/blood/src/sfx.h
@@ -51,6 +51,7 @@ void sfxPlay3DSoundCP(spritetype* pSprite, int soundId, int chanId = -1, int nFl
 void sfxKill3DSound(spritetype *pSprite, int chanId = -1, int soundId = -1);
 void sfxKillAllSounds(void);
 void sfxKillSpriteSounds(spritetype *pSprite);
+void sfxCorrectListenerPos(void);
 void sfxResetListener(void);
 void sfxUpdate3DSounds(void);
 void sfxSetReverb(bool toggle);