Skip to content

Commit cdb1e04

Browse files
committed
Remove the last vestiges of weapon_value() outside of char creation
1 parent d9fdf6f commit cdb1e04

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/npc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ npc_opinion npc::get_opinion_values( const Character &you ) const
16211621
} else {
16221622
npc_values.fear += 6;
16231623
}
1624-
} else if( you.weapon_value( *weapon ) > 20 ) {
1624+
} else if( you.evaluate_weapon( *weapon ) > 20 ) {
16251625
npc_values.fear += 2;
16261626
}
16271627

src/npcmove.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ float npc::evaluate_character( const Character &candidate, bool my_gun, bool ene
512512
bool candidate_gun = candidate.get_wielded_item() && candidate.get_wielded_item()->is_gun();
513513
const item &candidate_weap = candidate.get_wielded_item() ? *candidate.get_wielded_item() :
514514
null_item_reference();
515-
double candidate_weap_val = candidate.weapon_value( candidate_weap );
515+
double candidate_weap_val = candidate.evaluate_weapon( candidate_weap );
516516
float candidate_health = candidate.hp_percentage() / 100.0f;
517517
float armour = estimate_armour( candidate );
518518
float speed = std::max( 0.25f, candidate.get_speed() / 100.0f );

0 commit comments

Comments
 (0)