-
Notifications
You must be signed in to change notification settings - Fork 20
Reset toggles on death and aim toggle reset when switching weapons and dropping weapons #1499
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.
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
base: master
Are you sure you want to change the base?
Reset toggles on death and aim toggle reset when switching weapons and dropping weapons #1499
Conversation
|
Could we also fix the case where switching guns while in aim-toggle does not untoggle the aim even though it should? (Unless you think that should be its own PR) |
…s to stop view jerking during switch
|
kinda janky because the server doesn't know if the client is using hold or toggle to aim in |
|
Would it make sense to call AimToggleReset in Weapon_SetZoom to make sure we catch all cases? I can't think of any situations where you want it to zoom in again automatically. Cases I found while testing that aren't handled(but there might be more).
|
|
spawning in on a new round if you didn't die is outside the scope of this pr now idk. Networking m_bFirstAliveTick works once and then doesn't work on subsequent rounds someone else can figure it out if they want it fixed quickly |
| void C_NEO_Player::Weapon_Drop(C_NEOBaseCombatWeapon *pWeapon) | ||
| { | ||
| m_bIneligibleForLoadoutPick = true; | ||
| Weapon_SetZoom(false); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removal of this line makes aim stay when dropping weapons, accident? Did you mean to replace it with IN_AimToggleReset() or something?
Description
Resets toggle aim when dropping or switching weapons while maintaining aimed in status when using hold to aim and the weapon switched to supports aiming in, still kinda janky when holding aim button while dropping weapons sometimes
Toolchain
-fixes #1514
-fixes #1516