Merge pull request #873 from tmyqlfpir/fix-weapon-frames

Blood: Fix shotgun akimbo frame bug
nukeykt · Dec 17, 2024 · c09c32e · c09c32e
2 parents b08eb7e + bd5955c
commit c09c32e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/source/blood/src/weapon.cpp b/source/blood/src/weapon.cpp
@@ -247,7 +247,12 @@ void WeaponDraw(PLAYER *pPlayer, int a2, int x, int y, int a5)
     QAV * pQAV = weaponQAV[pPlayer->weaponQav];
     int v4;
     if (pPlayer->weaponTimer == 0)
-        v4 = (int)totalclock % pQAV->at10;
+    {
+        if (((pPlayer->weaponState == -1) || (pPlayer->curWeapon == kWeaponShotgun && pPlayer->weaponState == 7)) && !VanillaMode()) // if shotgun with guns akimbo, or ran out of ammo, set to last seq frame
+            v4 = pQAV->at10-1;
+        else
+            v4 = (int)totalclock % pQAV->at10;
+    }
     else
         v4 = pQAV->at10 - pPlayer->weaponTimer;
     pQAV->x = x;