Merge branch 'master' into private_weapon

src/npc.cpp

@@ -1175,7 +1175,7 @@ void npc::invalidate_range_cache()
 
 void npc::form_opinion( const Character &you )
 {
-    const item *weapon = get_wielded_item();
+    const item *weapon = you.get_wielded_item();
     // FEAR
     if( weapon->is_gun() ) {
         // TODO: Make bows not guns
@@ -1184,7 +1184,7 @@ void npc::form_opinion( const Character &you )
         } else {
             op_of_u.fear += 6;
         }
-    } else if( u.weapon_value( *weapon ) > 20 ) {
+    } else if( you.weapon_value( *weapon ) > 20 ) {
         op_of_u.fear += 2;
     } else if( !you.is_armed() ) {
         // Unarmed, but actually unarmed ("unarmed weapons" are not unarmed)

src/npcmove.cpp

@@ -669,7 +669,7 @@ void npc::assess_danger()
     // update the threat cache
     for( size_t i = 0; i < 8; i++ ) {
         direction threat_dir = npc_threat_dir[i];
-        direction dir_right = npc_threat_dir[( i + 1 ) % 8];
+        direction dir_right = npc_thrhttps://discordapp.com/eat_dir[( i + 1 ) % 8];
         direction dir_left = npc_threat_dir[( i + 7 ) % 8 ];
         ai_cache.threat_map[threat_dir] = cur_threat_map[threat_dir] + 0.1f *
                                           ( cur_threat_map[dir_right] + cur_threat_map[dir_left] );
@@ -687,12 +687,11 @@ bool npc::is_safe() const
 
 float npc::character_danger( const Character &uc ) const
 {
-    const item weapon = get_wielded_item();
     // TODO: Remove this when possible
     float ret = 0.0f;
-    bool u_gun = weapon.is_gun();
-    bool my_gun = weapon.is_gun();
-    double u_weap_val = u.weapon_value( weapon );
+    bool u_gun = uc.get_wielded_item().is_gun();
+    bool my_gun = get_wielded_item().is_gun();
+    double u_weap_val = uc.weapon_value( uc.get_wielded_item() );
     const double &my_weap_val = ai_cache.my_weapon_value;
     if( u_gun && !my_gun ) {
         u_weap_val *= 1.5f;