Merged
Conversation
* Fix scoped weapons disappearing when switched to while holding aim * Allow hold to aim during freeze time.
Rainyan
approved these changes
Feb 16, 2026
Collaborator
There was a problem hiding this comment.
edit: I should probably read the opening post properly before commenting...
LGTM, but since this is essentially reverting #1424 which was implemented because #1424 (comment) I do wonder if we run the risk of re-introducing bug #1367 that PR was targeting.
That being said, I couldn't reliably reproduce #1367 anyway so I'm not opposed to merging this and seeing what happens in playtest.
sunzenshen
approved these changes
Feb 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
I'm unsure about this because it's kinda reverting #1424. However, having ShouldDraw return false when the gun is first deployed seems to cause the viewmodel to not be added to the leaf system, and flipping the return value after that has no effect because UpdateVisibility is only called if the value is different between PreDataUpdate and PostDataUpdate, which it isn't.
My hope is that setting EF_NODRAW in ItemPostFrame will be more reliable than GetViewModelFOV, but let me know if you think there's a better place for it.
Toolchain
Linked Issues