Merge pull request #37871 from Ramza13/auto_forage

Fix dangerous pickups and auto forage not working together
CleverRaven · Feb 10, 2020 · 0a401c8 · 0a401c8
2 parents 1d0d809 + 4e4f579
commit 0a401c8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/iexamine.cpp b/src/iexamine.cpp
@@ -1600,7 +1600,7 @@ static void handle_harvest( player &p, const std::string &itemid, bool force_dro
 {
     item harvest = item( itemid );
     if( !force_drop && p.can_pickVolume( harvest, true ) &&
-        p.can_pickWeight( harvest, true ) ) {
+        p.can_pickWeight( harvest, !get_option<bool>( "DANGEROUS_PICKUPS" ) ) ) {
         p.i_add( harvest );
         p.add_msg_if_player( _( "You harvest: %s." ), harvest.tname() );
     } else {