Skip to content
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 assigned letter disappearing when taking weapon out of holster #26521

Merged
merged 1 commit into from Nov 4, 2018

Conversation

Projects
None yet
2 participants
@Qrox
Copy link
Contributor

commented Nov 4, 2018

Summary

SUMMARY: Bugfixes "Fix assigned letter disappearing when taking weapon out of holster"

Purpose of change

Fixes #17789. When auto inventory letter is on, assigned letter of holstered weapons may disappear when taken out.

Describe the solution

Use inventory::update_invlet instead of inventory::assign_empty_invlet in player::wield_contents so inventory letter is properly updated.

@Qrox Qrox force-pushed the Qrox:fix-17789 branch to 0936141 Nov 4, 2018

@ZhilkinSerg ZhilkinSerg self-assigned this Nov 4, 2018

@ZhilkinSerg ZhilkinSerg merged commit 5f1d57a into CleverRaven:master Nov 4, 2018

3 of 4 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
coverage/coveralls Coverage decreased (-0.08%) to 26.118%
Details
gorgon-ghprb Build finished.
Details

@ZhilkinSerg ZhilkinSerg removed their assignment Nov 4, 2018

@Qrox Qrox deleted the Qrox:fix-17789 branch Nov 15, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.