remove parameter avatar from game_menus::inv::unload_container

CleverRaven · Sep 17, 2024 · f8bda62 · f8bda62
1 parent db9763b
commit f8bda62
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/game.cpp b/src/game.cpp
@@ -9050,7 +9050,7 @@ void game::insert_item()
 void game::unload_container()
 {
     if( const std::optional<tripoint> pnt = choose_adjacent( _( "Unload where?" ) ) ) {
-        u.drop( game_menus::inv::unload_container( u ), *pnt );
+        u.drop( game_menus::inv::unload_container(), *pnt );
     }
 }
 

diff --git a/src/game_inventory.cpp b/src/game_inventory.cpp
@@ -1841,8 +1841,9 @@ static bool valid_unload_container( const item_location &container )
         && !container->contains_no_solids();
 }
 
-drop_locations game_menus::inv::unload_container( avatar &you )
+drop_locations game_menus::inv::unload_container()
 {
+    avatar &you = get_avatar();
     inventory_filter_preset unload_preset( valid_unload_container );
 
     inventory_drop_selector insert_menu( you, unload_preset, _( "CONTAINERS TO UNLOAD" ),

diff --git a/src/game_inventory.h b/src/game_inventory.h
@@ -133,7 +133,7 @@ item_location wield();
 /** Item wielding/unwielding menu. */
 drop_locations holster( const item_location &holster );
 void insert_items( item_location &holster );
-drop_locations unload_container( avatar &you );
+drop_locations unload_container();
 /** Choosing a gun to saw down it's barrel. */
 item_location saw_barrel( Character &you, item &tool );
 /** Choosing a gun to saw down its barrel. */