Eat menu

data/json/player_activities.json

@@ -342,6 +342,15 @@
     "based_on": "neither",
     "no_resume": true
   },
+  {
+    "id": "ACT_COMESTIBLE_INVENTORY",
+    "type": "activity_type",
+    "activity_level": "NO_EXERCISE",
+    "verb": "interacting with inventory",
+    "suspendable": false,
+    "based_on": "neither",
+    "no_resume": true
+  },
   {
     "id": "ACT_ARMOR_LAYERS",
     "type": "activity_type",

src/activity_handlers.cpp

@@ -16,6 +16,7 @@
 
 #include "action.h"
 #include "advanced_inv.h"
+#include "comestible_inv.h"
 #include "avatar.h"
 #include "avatar_action.h"
 #include "clzones.h"
@@ -139,6 +140,7 @@ activity_handlers::do_turn_functions = {
     { activity_id( "ACT_MOVE_ITEMS" ), move_items_do_turn },
     { activity_id( "ACT_MOVE_LOOT" ), move_loot_do_turn },
     { activity_id( "ACT_ADV_INVENTORY" ), adv_inventory_do_turn },
+    { activity_id( "ACT_COMESTIBLE_INVENTORY" ), comestible_inventory_do_turn },
     { activity_id( "ACT_ARMOR_LAYERS" ), armor_layers_do_turn },
     { activity_id( "ACT_ATM" ), atm_do_turn },
     { activity_id( "ACT_CRACKING" ), cracking_do_turn },
@@ -2608,6 +2610,12 @@ void activity_handlers::adv_inventory_do_turn( player_activity *, player *p )
     advanced_inv();
 }
 
+void activity_handlers::comestible_inventory_do_turn(player_activity*, player* p)
+{
+    p->cancel_activity();
+    comestible_inv();
+}
+
 void activity_handlers::drive_do_turn( player_activity *act, player *p )
 {
     vehicle *player_veh = veh_pointer_or_null( g->m.veh_at( p->pos() ) );

src/activity_handlers.h

@@ -81,6 +81,7 @@ void move_loot_do_turn( player_activity *act, player *p );
 void travel_do_turn( player_activity *act, player *p );
 void drive_do_turn( player_activity *act, player *p );
 void adv_inventory_do_turn( player_activity *act, player *p );
+void comestible_inventory_do_turn( player_activity *act, player *p );
 void armor_layers_do_turn( player_activity *act, player *p );
 void atm_do_turn( player_activity *act, player *p );
 void fish_do_turn( player_activity *act, player *p );

src/advanced_inv.cpp

@@ -173,6 +173,8 @@ void advanced_inventory::load_settings()
         panes[i].filter = uistate.adv_inv_filter[i];
     }
     uistate.adv_inv_exit_code = exit_none;
+
+    add_msg(m_info, "~~~ %d %d", uistate.wishitem_selected, uistate.save_var);
 }
 
 std::string advanced_inventory::get_sortname( advanced_inv_sortby sortby )