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

you can't unarm target that wield integrated weapon #73525

Closed
wants to merge 3 commits into from

Conversation

GuardianDll
Copy link
Member

Summary

None

Purpose of change

Fix #67958

Describe the solution

Add check for unarmed flag

Describe alternatives

Add additional code to bool game::npc_menu to not show the menu if weapon is integrated

Testing

Compiled, teleported to Apis, tried to disarm them, was not able to. Spawned a random NPC, tried to disarm, still can disarm them

@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Melee Melee weapons, tactics, techniques, reach attack labels May 5, 2024
src/melee.cpp Outdated Show resolved Hide resolved
src/melee.cpp Outdated Show resolved Hide resolved
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels May 5, 2024
@Maleclypse
Copy link
Member

Conflicts need resolving

@GuardianDll
Copy link
Member Author

wow, i miss it, but i accidentally PRd the fix in #73505: link
that is very weird but let's say the bug was resolved

@GuardianDll GuardianDll closed this May 6, 2024
@GuardianDll GuardianDll deleted the patch-1 branch May 7, 2024 13:28
@Procyonae Procyonae added the 0.H Backport PR to backport to the 0.H stable release canddiate label May 17, 2024
@Procyonae Procyonae mentioned this pull request May 17, 2024
@Procyonae Procyonae added 0.H Backported and removed 0.H Backport PR to backport to the 0.H stable release canddiate labels May 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.H Backported astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions Melee Melee weapons, tactics, techniques, reach attack
Projects
None yet
3 participants