-
Notifications
You must be signed in to change notification settings - Fork 276
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
fix(UI): gunmod wield info no longer causes game to crash #5136
Merged
Conversation
This file contains 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
Co-Authored-By: KheirFerrum <102964889+KheirFerrum@users.noreply.github.com>
chaosvolt
changed the title
fix (UI): gunmod wield info no longer causes game to crash
fix(UI): gunmod wield info no longer causes game to crash
Aug 3, 2024
scarf005
reviewed
Aug 3, 2024
Co-authored-by: scarf <greenscarf005@gmail.com>
@scarf005 so that change proposal borked it:
|
ugh i hate mutation
Aight, it compiles and works same as the initial method did. |
scarf005
approved these changes
Aug 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Checklist
Required
main
so it won't cause conflict when updatingmain
branch later.Optional
Purpose of change
This fixes a mistake I made in #4183 where UI changes did not play well with uninstalled gunmods.
Fixes #5132
Describe the solution
In character_functions.cpp, updated
fmt_wielded_weapon
so that the gun UI stuff only calls forgun_current_mode
if the affected item is a valid gun and not an isolated gunmod. Gunmods also no longer try to display fire mode since it's not relevant to gunmods that can't be fired when uninstalled.Describe alternatives you've considered
Just slapping
&& !weapon.is_gunmod()
to the opening if statement would be a braindead easy hack to fix this but would make it so wielded gunmods no longer show you their (technically irrelevant due to not being able to fire) loaded ammo in wield info.Testing
M4:
Loose M203:
M4 with M203 installed:
M4 with M203, M203 selected:
Additional context