Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blood: Fix firing state with akimbo mode for shotgun/napalm launcher #777

Merged
merged 1 commit into from
Feb 4, 2024
+4 −4
Merged

Blood: Fix firing state with akimbo mode for shotgun/napalm launcher #777

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions source/blood/src/weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ void WeaponLower(PLAYER *pPlayer)
}
break;
case kWeaponShotgun:
if (powerupCheck(pPlayer, kPwUpTwoGuns))
if (powerupCheck(pPlayer, kPwUpTwoGuns) && (VanillaMode() || (gInfiniteAmmo || CheckAmmo(pPlayer, 2, 4))))
StartQAV(pPlayer, 63, -1, 0);
else
StartQAV(pPlayer, 58, -1, 0);
Expand All @@ -786,7 +786,7 @@ void WeaponLower(PLAYER *pPlayer)
StartQAV(pPlayer, 81, -1, 0);
break;
case kWeaponNapalm:
if (powerupCheck(pPlayer, kPwUpTwoGuns))
if (powerupCheck(pPlayer, kPwUpTwoGuns) && (VanillaMode() || (gInfiniteAmmo || CheckAmmo(pPlayer, 4, 2))))
StartQAV(pPlayer, 124, -1, 0);
else
StartQAV(pPlayer, 92, -1, 0);
Expand Down Expand Up @@ -996,7 +996,7 @@ void WeaponUpdateState(PLAYER *pPlayer)
switch (vb)
{
case 3:
if (powerupCheck(pPlayer, kPwUpTwoGuns) && (gInfiniteAmmo || CheckAmmo(pPlayer,4, 4)))
if (powerupCheck(pPlayer, kPwUpTwoGuns) && (gInfiniteAmmo || CheckAmmo(pPlayer, 4, VanillaMode() ? 4 : 2)))
pPlayer->weaponQav = 121;
else
pPlayer->weaponQav = 90;
Expand Down Expand Up @@ -2406,7 +2406,7 @@ void WeaponProcess(PLAYER *pPlayer) {
}
break;
case kWeaponNapalm:
if (powerupCheck(pPlayer, kPwUpTwoGuns))
if (powerupCheck(pPlayer, kPwUpTwoGuns) && (VanillaMode() || (gInfiniteAmmo || CheckAmmo(pPlayer, 4, 2))))
StartQAV(pPlayer, 122, nClientFireNapalm, 0);
else
StartQAV(pPlayer, 91, nClientFireNapalm, 0);
Expand Down
Loading