Skip to content

Commit

Permalink
Merge pull request #33484 from ipcyborg/fix-33473-wield-and-use
Browse files Browse the repository at this point in the history
Fixed "Activating items near character with empty hands and 0 volume capacity does not (always) work #33473"
  • Loading branch information
ZhilkinSerg authored Aug 24, 2019
2 parents 5122a9c + 2c4b5d7 commit 566c2ba
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/game_inventory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ class pickup_inventory_preset : public inventory_selector_preset
if( !p.has_item( *loc ) ) {
if( loc->made_of_from_type( LIQUID ) ) {
return _( "Can't pick up spilt liquids" );
} else if( !p.can_pickVolume( *loc ) ) {
} else if( !p.can_pickVolume( *loc ) && p.is_armed() ) {
return _( "Too big to pick up" );
} else if( !p.can_pickWeight( *loc ) ) {
return _( "Too heavy to pick up" );
Expand Down

0 comments on commit 566c2ba

Please sign in to comment.