Merge pull request #47789 from Qrox/wield

Always list wielded item in AIM worn panel
CleverRaven · Feb 28, 2021 · 0c24435 · 0c24435
2 parents e6f6ee5 + 96d25fd
commit 0c24435
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/advanced_inv_pane.cpp b/src/advanced_inv_pane.cpp
@@ -166,7 +166,7 @@ void advanced_inventory_pane::add_items_from_area( advanced_inv_area &square,
         square.volume = 0_ml;
         square.weight = 0_gram;
 
-        if( u.weapon.is_container() ) {
+        if( !u.weapon.is_null() ) {
             advanced_inv_listitem it( item_location( u, &u.weapon ), 0, 1, square.id, false );
             if( !is_filtered( *it.items.front() ) ) {
                 square.volume += it.volume;