Skip to content

Fix crouchbug firing delay when crouchbug glitch is enabled #5229

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

Open
MohabCodeX wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −10
Open

Fix crouchbug firing delay when crouchbug glitch is enabled #5229

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
26 changes: 16 additions & 10 deletions Client/mods/deathmatch/logic/CClientPed.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3178,23 +3178,29 @@ void CClientPed::ApplyControllerStateFixes(CControllerState& Current)
Current.ButtonSquare = 0;
Current.ButtonCross = 0;
}
// Disable the fire keys whilst crouching as well
Current.ButtonCircle = 0;
Current.LeftShoulder1 = 0;
// Disable the fire keys whilst crouching as well unless crouchbug or fastfire glitch is enabled
if (!g_pClientGame->IsGlitchEnabled(CClientGame::GLITCH_CROUCHBUG) && !g_pClientGame->IsGlitchEnabled(CClientGame::GLITCH_FASTFIRE))
{
Current.ButtonCircle = 0;
Current.LeftShoulder1 = 0;
}
if (m_ulLastTimeBeganCrouch >= ulNow - 400.0f * fSpeedRatio)
{
// Disable double crouching (another anim cut)
if (g_pClientGame->IsUsingAlternatePulseOrder())
Current.ShockButtonL = 255; // Do this differently if we have changed the pulse order
else
Current.ShockButtonL = 0;
// Disable double crouching (another anim cut) unless glitch is enabled
if (!g_pClientGame->IsGlitchEnabled(CClientGame::GLITCH_CROUCHBUG) && !g_pClientGame->IsGlitchEnabled(CClientGame::GLITCH_FASTFIRE))
{
if (g_pClientGame->IsUsingAlternatePulseOrder())
Current.ShockButtonL = 255; // Do this differently if we have changed the pulse order
else
Current.ShockButtonL = 0;
}
}
}
}
// If we just started aiming, make sure they dont try and crouch
// If we just started aiming, make sure they dont try and crouch unless crouchbug or fastfire is enabled
else if ((m_ulLastTimeBeganAiming != 0 && m_ulLastTimeBeganAiming >= ulNow - 300.0f * fSpeedRatio) || (ulNow - m_ulLastTimeFired) <= 300.0f * fSpeedRatio)
{
if (!g_pClientGame->IsGlitchEnabled(CClientGame::GLITCH_FASTFIRE))
if (!g_pClientGame->IsGlitchEnabled(CClientGame::GLITCH_CROUCHBUG) && !g_pClientGame->IsGlitchEnabled(CClientGame::GLITCH_FASTFIRE))
{
Current.ShockButtonL = 0;
}
Expand Down
Loading