Skip to content

Supa7 use Slugs with no primary ammo #573

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

Merged
AdamTadeusz merged 2 commits into from
Sep 19, 2024
Merged

Supa7 use Slugs with no primary ammo #573

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66e2351
Allow loading of slugs with no primary ammo (Thanks Agiel)
AdamTadeusz Sep 9, 2024
3a3ad1c
rotate if else
AdamTadeusz Sep 14, 2024
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
18 changes: 9 additions & 9 deletions mp/src/game/shared/neo/weapons/weapon_supa7.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,20 +397,20 @@ void CWeaponSupa7::ItemPostFrame(void)
}
else if (m_flNextPrimaryAttack <= gpGlobals->curtime)
{
// If out of ammo end reload
if (m_iPrimaryAmmoCount <= 0 || m_bSlugLoaded || m_iClip1 >= GetMaxClip1())
// If we're supposed to have a slug loaded, load it
if (m_bSlugDelayed)
{
FinishReload();
if (!ReloadSlug())
{
m_bSlugDelayed.GetForModify() = false;
}
}
else
{
// If we're supposed to have a slug loaded, load it
if (m_bSlugDelayed)
// If out of ammo end reload
if ((m_iPrimaryAmmoCount <= 0 || m_bSlugLoaded || m_iClip1 >= GetMaxClip1()))
{
if (!ReloadSlug())
{
m_bSlugDelayed.GetForModify() = false;
}
FinishReload();
}
else
{
Expand Down