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.

Sign up for GitHub

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

Jump to bottom

Fix auto_attacking barehanded NPC crash #64772

Merged
merged 2 commits into from
Apr 4, 2023
Merged

Fix auto_attacking barehanded NPC crash #64772

merged 2 commits into from
Apr 4, 2023

Conversation

SurFlurer
Copy link
Contributor

@SurFlurer SurFlurer commented Apr 2, 2023 •
edited
Loading

Summary

Bugfixes "Fix auto_attacking barehanded NPC crash"

Purpose of change

Fix #64677

Describe the solution

Thanks for @andrei8l's help. When the NPC is barehanded, return unarmed_value() (which was used nowhere™) instead of melee_value().

Describe alternatives you've considered

Testing

Fixed the crash.

Additional context

@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` labels Apr 2, 2023
github-actions[bot]
github-actions bot reviewed Apr 2, 2023
View reviewed changes
src/avatar_action.cpp Outdated Show resolved Hide resolved
@SurFlurer @github-actions
reviewdog
3ed04f2 
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 labels Apr 2, 2023
@mqrause
Copy link
Contributor

mqrause commented Apr 2, 2023

Oops, that's a pretty long lived remnant of #58666.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 2, 2023
@Fris0uman Fris0uman merged commit 19b3769 into CleverRaven:master Apr 4, 2023
@SurFlurer SurFlurer deleted the combat_crash branch April 4, 2023 11:13
Maleclypse pushed a commit to Maleclypse/Cataclysm-DDA that referenced this pull request Apr 6, 2023
@SurFlurer @github-actions @Maleclypse
Fix auto_attacking barehanded NPC crash (CleverRaven#64772)
258c223 
* fix crash

* reviewdog

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

Assignees
No one assigned
Labels
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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Crash on bandit combat
3 participants
@SurFlurer @mqrause @Fris0uman