Merge pull request CleverRaven#68226 from Kamayana/aim_move_all_fixes

[AIM] Make Move All actually move as much as it can

Author: Maleclypse

src/activity_actor.cpp

@@ -4391,7 +4391,7 @@ void insert_item_activity_actor::finish( player_activity &act, Character &who )
 
         if( !ret.success() ) {
             success = false;
-            std::string error = !ret.str().empty() ?
+            std::string error = ret.str().empty() ?
                                 //~ %1$s: item we failed to put in the container, %2$s: container to put item in
                                 string_format( _( "Could not put %1$s into %2$s." ),
                                                it.tname(), holster->tname() ) :

src/advanced_inv.cpp

@@ -149,17 +149,13 @@ class advanced_inventory
 
         bool move_all_items();
         /**
-        * Fills drop_or_stash_item_info lists with the current contents of the active pane, for use with move_all_items.
-        * @param player_character Reference to the player character.
-        * @param spane Reference to the active AIM pane.
-        * @param item_list Reference to the list to fill with items.
-        * @param fav_list Reference to the list to fill with favorited items.
-        * @param filter_buckets Whether to skip over containers that would spill in certain locations.
-        * @return a string description of why some items were skipped, if any.
+        * Fills drop_or_stash_item_info vectors with the contents of the AIM's panes, for use with move_all_items.
         */
-        std::string fill_lists_with_pane_items( side &p, Character &player_character,
-                                                std::vector<drop_or_stash_item_info> &item_list,
-                                                std::vector<drop_or_stash_item_info> &fav_list, bool filter_buckets );
+        bool fill_lists_with_pane_items( Character &player_character, advanced_inv_sortby sort_priority,
+                                         advanced_inventory_pane &spane, advanced_inventory_pane &dpane,
+                                         std::vector<drop_or_stash_item_info> &item_list,
+                                         std::vector<drop_or_stash_item_info> &fav_list, bool forbid_buckets );
+
         // Returns the x coordinate where the header started. The header is
         // displayed right of it, everything left of it is till free.
         int print_header( advanced_inventory_pane &pane, aim_location sel );

src/advanced_inv.h

@@ -179,19 +179,6 @@ void advanced_inv_area::init()
     }
 }
 
-units::volume advanced_inv_area::free_volume( bool in_vehicle ) const
-{
-    // should be a specific location instead
-    cata_assert( id != AIM_ALL );
-    if( id == AIM_INVENTORY || id == AIM_WORN ) {
-        return get_player_character().free_space();
-    } else if( in_vehicle ) {
-        return get_vehicle_stack().free_volume();
-    } else {
-        return get_map().free_volume( pos );
-    }
-}
-
 bool advanced_inv_area::is_same( const advanced_inv_area &other ) const
 {
     // All locations (sans the below) are compared by the coordinates,

src/advanced_inv_area.cpp

@@ -93,8 +93,6 @@ class advanced_inv_area
 
         template <typename T>
         advanced_inv_area::itemstack i_stacked( T items );
-        // if you want vehicle cargo, specify so via `in_vehicle'
-        units::volume free_volume( bool in_vehicle = false ) const;
         int get_item_count() const;
         // Other area is actually the same item source, e.g. dragged vehicle to the south and AIM_SOUTH
         bool is_same( const advanced_inv_area &other ) const;

src/advanced_inv_area.h

@@ -430,6 +430,40 @@ advanced_inv_listitem *advanced_inventory_pane::get_cur_item_ptr()
     return &items[index];
 }
 
+units::volume advanced_inventory_pane::free_volume( const advanced_inv_area &square ) const
+{
+    // should be a specific location instead
+    cata_assert( area != AIM_ALL );
+    if( area == AIM_CONTAINER ) {
+        if( !container ) {
+            return 0_ml;
+        }
+        return container->get_remaining_capacity();
+    } else if( area == AIM_INVENTORY || area == AIM_WORN ) {
+        return get_player_character().free_space();
+    } else if( in_vehicle() ) {
+        return square.get_vehicle_stack().free_volume();
+    } else {
+        return get_map().free_volume( square.pos );
+    }
+}
+
+units::mass advanced_inventory_pane::free_weight_capacity() const
+{
+    // should be a specific location instead
+    cata_assert( area != AIM_ALL );
+    if( area == AIM_CONTAINER ) {
+        if( !container ) {
+            return 0_gram;
+        }
+        return container->get_remaining_weight_capacity();
+    } else if( area == AIM_INVENTORY || area == AIM_WORN ) {
+        return get_player_character().free_weight_capacity();
+    } else {
+        return units::mass_max;
+    }
+}
+
 void advanced_inventory_pane::set_filter( const std::string &new_filter )
 {
     if( filter == new_filter ) {

src/advanced_inv_pane.cpp

@@ -127,6 +127,14 @@ class advanced_inventory_pane
          * item in @ref items.
          */
         advanced_inv_listitem *get_cur_item_ptr();
+        /**
+         * @return free volume capacity of the pane's container or area
+         */
+        units::volume free_volume( const advanced_inv_area &square ) const;
+        /**
+         * @return free weight capacity of the pane's container or area
+         */
+        units::mass free_weight_capacity() const;
         /**
          * Set the filter string, disables filtering when the filter string is empty.
          */

src/advanced_inv_pane.h

@@ -8560,6 +8560,14 @@ units::volume Character::free_space() const
     return volume_capacity;
 }
 
+units::mass Character::free_weight_capacity() const
+{
+    units::mass weight_capacity = 0_gram;
+    weight_capacity += weapon.get_remaining_weight_capacity();
+    weight_capacity += worn.free_weight_capacity();
+    return weight_capacity;
+}
+
 units::volume Character::holster_volume() const
 {
     units::volume holster_volume = 0_ml;

src/character.cpp

@@ -2202,6 +2202,7 @@ class Character : public Creature, public visitable
         units::volume volume_capacity_with_tweaks( const std::vector<std::pair<item_location, int>>
                 &locations ) const;
         units::volume free_space() const;
+        units::mass free_weight_capacity() const;
         /**
          * Returns the total volume of all worn holsters.
         */

src/character.h

@@ -1613,6 +1613,15 @@ units::volume outfit::free_space() const
     return volume_capacity;
 }
 
+units::mass outfit::free_weight_capacity() const
+{
+    units::mass weight_capacity = 0_gram;
+    for( const item &w : worn ) {
+        weight_capacity += w.get_remaining_weight_capacity();
+    }
+    return weight_capacity;
+}
+
 units::volume outfit::holster_volume() const
 {
     units::volume ret = 0_ml;