Fixed bug where 'w'ield can pick up NPC items without triggering warn…

…ing (CleverRaven#66807)

* fixed issue where wield menu can steal without prompting warning

* Update src/activity_actor.cpp

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

* Update src/game.cpp

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

* fixed naming for clang-tidy

---------

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

src/activity_actor.cpp

@@ -5534,13 +5534,21 @@ static bool check_stealing( Character &who, item &it )
             Pickup::query_thief();
         }
         if( who.get_value( "THIEF_MODE" ) == "THIEF_HONEST" ) {
+            if( who.get_value( "THIEF_MODE_KEEP" ) != "YES" ) {
+                who.set_value( "THIEF_MODE", "THIEF_ASK" );
+            }
             return false;
         }
     }
 
     return true;
 }
 
+bool avatar_action::check_stealing( Character &who, item &weapon )
+{
+    return ::check_stealing( who, weapon );
+}
+
 void wield_activity_actor::do_turn( player_activity &, Character &who )
 {
     if( who.moves > 0 ) {

src/avatar_action.h

@@ -82,6 +82,9 @@ void unload( avatar &you );
 // Use item; also tries E,R,W  'a'
 void use_item( avatar &you, item_location &loc, std::string const &method = {} );
 void use_item( avatar &you );
+
+/** Check if avatar is stealing a weapon. */
+bool check_stealing( Character &who, item &weapon );
 } // namespace avatar_action
 
 #endif // CATA_SRC_AVATAR_ACTION_H

src/game.cpp

@@ -9854,6 +9854,12 @@ void game::wield( item_location loc )
     tripoint pos = loc.position();
     const int obtain_cost = loc.obtain_cost( u );
     int worn_index = INT_MIN;
+
+    // Need to account for case where we're trying to wield a weapon that belongs to someone else
+    if( !avatar_action::check_stealing( u, *loc.get_item() ) ) {
+        return;
+    }
+
     if( u.is_worn( *loc.get_item() ) ) {
         auto ret = u.can_takeoff( *loc.get_item() );
         if( !ret.success() ) {