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

Fix auto_attacking barehanded NPC crash #64772

Merged
merged 2 commits into from
Apr 4, 2023
Merged

Fix auto_attacking barehanded NPC crash #64772

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
876b923
fix crash
SurFlurer Apr 2, 2023
3ed04f2
reviewdog
SurFlurer Apr 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/avatar_action.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,12 @@ static float rate_critter( const Creature &c )
{
const npc *np = dynamic_cast<const npc *>( &c );
if( np != nullptr ) {
return np->weapon_value( *np->get_wielded_item() );
item_location wielded = np->get_wielded_item();
if( wielded ) {
return np->weapon_value( *wielded );
} else {
return np->unarmed_value();
}
}

const monster *m = dynamic_cast<const monster *>( &c );
Expand Down