Skip to content

Don't reset toggles for actions not done by local players #1608

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
AdamTadeusz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Don't reset toggles for actions not done by local players #1608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f761204
init
AdamTadeusz Jan 13, 2026
5452758
extra careful even if some of these dont seem to be run outside of th…
AdamTadeusz Jan 13, 2026
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
5 changes: 4 additions & 1 deletion src/game/client/hl2mp/c_hl2mp_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,10 @@ void C_HL2MP_Player::StartSprinting( void )

m_fIsSprinting = true;
#ifdef NEO
IN_LeanToggleReset();
if (IsLocalPlayer())
{
IN_LeanToggleReset();
}
#endif // NEO
}

Expand Down
23 changes: 18 additions & 5 deletions src/game/client/neo/c_neo_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,8 +1298,12 @@ void C_NEO_Player::PostThink(void)

Weapon_SetZoom(false);
m_bInVision = m_bInThermOpticCamo = false;
IN_LeanReset();
LiftAllToggleKeys();

if (IsLocalPlayer())
{
IN_LeanReset();
LiftAllToggleKeys();
}

if (IsLocalPlayer() && GetDeathTime() != 0 && (GetTeamNumber() == TEAM_JINRAI || GetTeamNumber() == TEAM_NSF))
{
Expand Down Expand Up @@ -1685,7 +1689,10 @@ bool C_NEO_Player::ShouldDrawHL2StyleQuickHud(void)
void C_NEO_Player::Weapon_Drop(C_NEOBaseCombatWeapon *pWeapon)
{
m_bIneligibleForLoadoutPick = true;
IN_AimToggleReset();
if (IsLocalPlayer())
{
IN_AimToggleReset();
}

if (pWeapon->IsGhost())
{
Expand All @@ -1711,7 +1718,10 @@ void C_NEO_Player::StartSprinting(void)
void C_NEO_Player::StopSprinting(void)
{
m_fIsSprinting = false;
IN_SpeedReset();
if (IsLocalPlayer())
{
IN_SpeedReset();
}
}

bool C_NEO_Player::CanSprint(void)
Expand Down Expand Up @@ -1875,7 +1885,10 @@ void C_NEO_Player::Weapon_SetZoom(const bool bZoomIn)
else
{
m_Local.m_iHideHUD |= HIDEHUD_CROSSHAIR;
IN_AimToggleReset();
if (IsLocalPlayer())
{
IN_AimToggleReset();
}
}

const int fov = GetDefaultFOV();
Expand Down
5 changes: 4 additions & 1 deletion src/game/shared/gamemovement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2668,7 +2668,10 @@ bool CGameMovement::CheckJumpButton( void )

OnJump(mv->m_outJumpVel.z);
#if defined NEO && defined CLIENT_DLL
IN_LeanToggleReset();
if (neoPlayer->IsLocalPlayer())
{
IN_LeanToggleReset();
}
#endif // NEO && CLIENT_DLL

// Set jump time.
Expand Down
5 changes: 4 additions & 1 deletion src/game/shared/neo/weapons/weapon_neobasecombatweapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,10 @@ bool CNEOBaseCombatWeapon::Holster(CBaseCombatWeapon* pSwitchingTo)
pOwner->Weapon_SetZoom(false);
}
#ifdef CLIENT_DLL
IN_AimToggleReset();
if (pOwner->IsLocalPlayer())
{
IN_AimToggleReset();
}
#endif // CLIENT_DLL
}

Expand Down