Skip to content

Commit

Permalink
throwing = true
Browse files Browse the repository at this point in the history
  • Loading branch information
RenechCDDA committed Aug 14, 2024
1 parent 8724e55 commit 62dff38
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/npc_attack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -585,9 +585,9 @@ void npc_attack_activate_item::use( npc &source, const tripoint &/*location*/ )
if( !source.wield( activatable_item ) ) {
debugmsg( "%s can't wield %s it tried to activate", source.disp_name(),
activatable_item.display_name() );
return;
return;
}
// npc::wield does bizarre things, we can't assume activatable_item's reference remains valid
// npc::wield does bizarre things, we can't assume activatable_item's reference remains valid
source.activate_item( *source.get_wielded_item() );
}

Expand Down Expand Up @@ -637,7 +637,7 @@ void npc_attack_throw::use( npc &source, const tripoint &location ) const

if( has_obstruction( source.pos(), location, false ) ||
( source.rules.has_flag( ally_rule::avoid_friendly_fire ) &&
!source.wont_hit_friend( location, thrown_item, false ) ) ) {
!source.wont_hit_friend( location, thrown_item, true ) ) ) {
if( can_move( source ) ) {
source.avoid_friendly_fire();
} else {
Expand Down

0 comments on commit 62dff38

Please sign in to comment.