overflow items before consuming/using them to avoid removing items wi…

…th migrated charges in their migration pocket
Golfavel · Jul 30, 2023 · f5489e4 · f5489e4
1 parent 2741ea4
commit f5489e4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp
@@ -2636,13 +2636,15 @@ void activity_handlers::eat_menu_do_turn( player_activity *, Character *you )
 void activity_handlers::consume_food_menu_do_turn( player_activity *, Character * )
 {
     avatar &player_character = get_avatar();
-    avatar_action::eat( player_character, game_menus::inv::consume_food( player_character ) );
+    item_location loc = game_menus::inv::consume_food( player_character );
+    avatar_action::eat( player_character, loc );
 }
 
 void activity_handlers::consume_drink_menu_do_turn( player_activity *, Character * )
 {
     avatar &player_character = get_avatar();
-    avatar_action::eat( player_character, game_menus::inv::consume_drink( player_character ) );
+    item_location loc = game_menus::inv::consume_drink( player_character );
+    avatar_action::eat( player_character, loc );
 }
 
 void activity_handlers::consume_meds_menu_do_turn( player_activity *, Character * )

diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp
@@ -912,7 +912,7 @@ bool avatar_action::eat_here( avatar &you )
     return false;
 }
 
-void avatar_action::eat( avatar &you, const item_location &loc )
+void avatar_action::eat( avatar &you, item_location &loc )
 {
     std::string filter;
     if( !you.activity.str_values.empty() ) {
@@ -922,7 +922,7 @@ void avatar_action::eat( avatar &you, const item_location &loc )
                         you.activity.id() );
 }
 
-void avatar_action::eat( avatar &you, const item_location &loc,
+void avatar_action::eat( avatar &you, item_location &loc,
                          const std::vector<int> &consume_menu_selections,
                          const std::vector<item_location> &consume_menu_selected_items,
                          const std::string &consume_menu_filter,
@@ -933,6 +933,7 @@ void avatar_action::eat( avatar &you, const item_location &loc,
         add_msg( _( "Never mind." ) );
         return;
     }
+    loc.overflow();
     you.assign_activity( consume_activity_actor( loc, consume_menu_selections,
                          consume_menu_selected_items, consume_menu_filter, type ) );
     you.last_item = item( *loc ).typeId();
@@ -1094,6 +1095,8 @@ void avatar_action::use_item( avatar &you, item_location &loc, std::string const
         }
     }
 
+    loc.overflow();
+
     if( loc->is_comestible() && loc->is_frozen_liquid() ) {
         add_msg( _( "Try as you might, you can't consume frozen liquids." ) );
         return;

diff --git a/src/avatar_action.h b/src/avatar_action.h
@@ -21,8 +21,8 @@ namespace avatar_action
 {
 
 /** Eat food or fuel  'E' (or 'a') */
-void eat( avatar &you, const item_location &loc );
-void eat( avatar &you, const item_location &loc,
+void eat( avatar &you, item_location &loc );
+void eat( avatar &you, item_location &loc,
           const std::vector<int> &consume_menu_selections,
           const std::vector<item_location> &consume_menu_selected_items,
           const std::string &consume_menu_filter, activity_id type );

diff --git a/src/handle_action.cpp b/src/handle_action.cpp
@@ -1748,12 +1748,16 @@ void game::open_consume_item_menu()
 
     avatar &player_character = get_avatar();
     switch( as_m.ret ) {
-        case 0:
-            avatar_action::eat( player_character, game_menus::inv::consume_food( player_character ) );
+        case 0: {
+            item_location loc = game_menus::inv::consume_food( player_character );
+            avatar_action::eat( player_character, loc );
             break;
-        case 1:
-            avatar_action::eat( player_character, game_menus::inv::consume_drink( player_character ) );
+        }
+        case 1: {
+            item_location loc = game_menus::inv::consume_drink( player_character );
+            avatar_action::eat( player_character, loc );
             break;
+        }
         case 2:
             avatar_action::eat_or_use( player_character, game_menus::inv::consume_meds( player_character ) );
             break;

diff --git a/src/item_pocket.cpp b/src/item_pocket.cpp
@@ -1681,7 +1681,7 @@ static void move_to_parent_pocket_recursive( const tripoint &pos, item &it,
         if( parent_pocket && parent_pocket->can_contain( it ).success() ) {
             add_msg( m_bad, _( "Your %1$s falls into your %2$s." ), it.display_name(),
                      loc.parent_item()->label( 1 ) );
-            loc.parent_pocket()->insert_item( it );
+            parent_pocket->insert_item( it );
             return;
         }
         if( loc.where() == item_location::type::container ) {