From fd6a3984f6b269680ec6f5d95be4bd40e555aa8d Mon Sep 17 00:00:00 2001
From: Jeremy Rose <nornagon@nornagon.net>
Date: Tue, 6 Feb 2024 20:39:20 -0800
Subject: [PATCH] fix (f)ire "draw what" menu repeating same gun

---
 src/character_attire.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/character_attire.cpp b/src/character_attire.cpp
index c1ab16acfcdfb..bf9f8cefb701c 100644
--- 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" ) ) {