Merge pull request #73717 from Procyonae/Backport71582

Backport #71582
CleverRaven · May 12, 2024 · 599168e · 599168e
2 parents 0227c74 + fd6a398
commit 599168e
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/character_attire.cpp b/src/character_attire.cpp
@@ -2024,10 +2024,8 @@ void outfit::fire_options( Character &guy, std::vector<std::string> &options,
                            std::vector<std::function<void()>> &actions )
 {
     for( item &clothing : worn ) {
-
-        std::vector<item *> guns = guy.cache_get_items_with( "is_gun", &item::is_gun,
-        [&guy]( const item & it ) {
-            return !guy.is_wielding( it );
+        std::vector<item *> guns = clothing.items_with( []( const item & it ) {
+            return it.is_gun();
         } );
 
         if( !guns.empty() && clothing.type->can_use( "holster" ) ) {