Inventory_UI: Hide installed gunmods but show loose ones

Author: Joeltom1

src/inventory_ui.cpp

@@ -58,6 +58,7 @@
 #include "uistate.h"
 #include "units.h"
 #include "units_utility.h"
+#include "value_ptr.h" 
 #include "vehicle.h"
 #include "vehicle_selector.h"
 #include "vpart_position.h"
@@ -703,6 +704,18 @@ inventory_selector_preset::inventory_selector_preset()
     } ) );
 }
 
+bool inventory_selector_preset::is_shown( const item_location &loc ) const
+{
+    if( loc->is_gunmod() ) {
+        item_location parent = loc.parent_item();
+        const bool installed = parent && parent->is_gun();
+        if( installed && !loc->type->gunmod->is_visible_when_installed ) {
+            return false;
+        }
+    }
+    return true;
+}
+
 bool inventory_selector_preset::sort_compare( const inventory_entry &lhs,
         const inventory_entry &rhs ) const
 {

src/inventory_ui.h

@@ -26,14 +26,12 @@
 #include "input_context.h"
 #include "item.h"
 #include "item_location.h"
-#include "itype.h"
 #include "memory_fast.h"
 #include "pimpl.h"
 #include "pocket_type.h"
 #include "point.h"
 #include "translations.h"
 #include "units.h"
-#include "value_ptr.h"
 
 class Character;
 class JsonObject;
@@ -241,12 +239,8 @@ class inventory_selector_preset
         virtual ~inventory_selector_preset() = default;
 
         /** Does this entry satisfy the basic preset conditions? */
-        virtual bool is_shown( const item_location &loc ) const {
-            if( loc->is_gunmod() && !loc->type->gunmod->is_visible_when_installed ) {
-                return false;
-            }
-            return true;
-        }
+        virtual bool is_shown( const item_location &loc ) const;
+
 
         /**
          * The reason why this entry cannot be selected.